The change that will follow solution C or D is planned for EiffelStudio 19.05 to prevent last minute breaking changes in 18.11. This will change the default of the option "total order on reals" for newly created projects. Old projects could still rely on the current behavior. However, the compiler will report a warning when "total order on reals" is set to False.

The current workaround is to set the option "total order on reals" to True for all projects explicitly.