Cleaning up two more pre-Visual C++ 2012 build hacks.