Last few pep8 complaints fixed.

[ci skip]