Convert to Visual Studio 2012, fix up build after rebase on 5.5.