Some cleanup to support VS2012.