Cleanup some unneeded changes, reduce diff to main branch. Add alternative to...

Cleanup some unneeded changes, reduce diff to main branch. Add alternative to NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_SWB_fenv_fx with much less changes.