Merge "Clean-up _fpmath and fake_long_doubles"