Merge "Switch from FloatMath -> Math and Math.hypot where possible"