Floating point code clean up. See merge request !263
mentioned in issue #688 (closed)
mentioned in issue #696 (closed)