Re-fixed merges in Main.

You missed this one. (If you want it the old way, feel free to
roll-back.)