Remove hack not needed for VS2013.
Some minor whitespace cleanup.