Lint fixes.
Merge pull request #63 from pjonsson/lint-fixes

HLint fixes.