Fix more pep8 issues in code I touched recently.