Second autopep8 pass.