Clean up MSVC compile issues since last merge from master.