Fix some PMD errors.
Merge pull request #175 from csmith/gradle-pmd

Fix some PMD errors.