options.h macros clean up along with corresponding code, float code clean up [allow regression] See merge request !826
mentioned in issue #1061