Ensure amalgamated build for MSVC uses minimal 3 translation units.
Merge branch 'amalgamated' into master.