Linter fixes.

./lint.sh complained about some of my changes in pull request 248, sorry about that.