Minor fixes to compile performance regression repro on my old VS 2010