Fix a few spots where autopep8 got it wrong