Replace FP math faked in integers with plain floating-point math