We can gain some WMPOS by reordering the assignments at the end of the loop. The changes are bit-exact to the legacy code. All changes are encapsulated in a macro (see lib_com/options.h)