Revert a couple of autopep8 whitespace changes that broke tests