Whitespace fixes to make the commit hook on hg.python.org happy.