JSLint-compliant

Ugh, I may move to JSHint at some point. Some of these changes are
annoying.