Fixup for MASM, macros & remove .obj.
Syncs with 722fb14e1d42089b7a2f586dcc7d717d3a8262ad in main.