Apply code review feedback
Apply code review feedback

AndyGerlicher/msbuild,rainersigwald/msbuild,rainersigwald/msbuild,sean-gilliam/msbuild,AndyGerlicher/msbuild,sean-gilliam/msbuild,AndyGerlicher/msbuild,sean-gilliam/msbuild,rainersigwald/msbuild,sean-gilliam/msbuild,AndyGerlicher/msbuild,rainersigwald/msbuild