Issue #7117, continued: Change round implementation to use the correctly-rounded