Replaced some string changes to better support VS2012

Previous changes were introduced that were VS2013-centric. These have
been backed out for VS2012 support.