Cleaning up a bunch of pre-Visual C++ 2012 build hacks.