Fix some PMD violations.
Merge pull request #169 from csmith/master

Fix some PMD violations.