Fix lint warnings.
Merge pull request #201 from kberg/lint-cleanse

Fix lint warnings.