More aggressive autopep8 fixes