Two problems I didn't see before that are now fixed.

First, I never got around to testing my changes to @kilian's patch for #23 and
just found that I had mistyped a variable.

Also, on more complex code that what I had tested on previously, my patch to
pep8 was insufficient. This should work without error now.