Add the two missing variables that the if check requires.
Style guide cleanup.

Most of these changes are just simple bits but I've wrapped a bunch of
stuff around 80 lines so it's slightly more readable.  These should all
be no-op changes.
Merge pull request #236 from apenney/style

Style fixes (and a bugfix)