Whitespace fixes. (My bad; C++ settings for VS2012 was incorrectly set to use tabs instead of spaces, leading to some noise in the diff.)