Jalopy source code cleanup.

I wouldn't typically do this in a pull request, but it's a good opportunity to review jalopy rules as they will get applied to several other projects in the near term.

I don't mind this style, but I would never write code this way.