Fix a few places where autopep8 made a bad choice