Some PropertyGroup elements snuck in

They're already defined in the PropertyGroups with the Condition
attributes (for VS version checking).