Simplify float conversions

Feel free to just fetch this and merge/rebase/squash/whatever.