[PATCH 01/14] Fix whitespace weirdness