Fix for various PEP8 errors.

pep8 1.5.2 started to report errors when a new line follows the
parameter equal, and when a variable is redefined in a list
comprehension.