Normalize 'for' and 'while' constructs so that they can be reformatted properly.

Conflicts:
	test/test_autopep8.py