Update code style to match pep8 version 1.5.7

It appears that the pep8 script has updated its rules a bit between
versions 1.4.6 and 1.5.7 . This commit updates some of the code to
ensure the style is up-to-date with version 1.5.7 .