pep8 fixes. (Strictly speaking, cflpep8 fixes since we ignore line
length.)