Fixes from 'make pep8'.  Partial, more to come.