Swap MWC2 and MWC1 code, so MWC2 comes first.
We prefer MWC2, so put its code first, then MWC1 can call some of its functions.
Change mix functions to only calc 'next' for the state variable being changed.
Move mix functions to be last of the group.