Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: BenVillalobos <e79efc49b113df965b007ed3ffd9a45b8819d62b@gmail.com>
mono/msbuild,sean-gilliam/msbuild,chipitsine/msbuild,chipitsine/msbuild,AndyGerlicher/msbuild,mono/msbuild,jeffkl/msbuild,jeffkl/msbuild,sean-gilliam/msbuild,jeffkl/msbuild,rainersigwald/msbuild,rainersigwald/msbuild,mono/msbuild,AndyGerlicher/msbuild,cdmihai/msbuild,AndyGerlicher/msbuild,chipitsine/msbuild,cdmihai/msbuild,AndyGerlicher/msbuild,jeffkl/msbuild,cdmihai/msbuild,sean-gilliam/msbuild,rainersigwald/msbuild,rainersigwald/msbuild,chipitsine/msbuild,cdmihai/msbuild,mono/msbuild,sean-gilliam/msbuild