Additional changes needed for transition to VS Express and removal of
MSFT-specific constructs.