Checkstyle

Checkstyle can be run using

    gradle chekstyleMain

or

    gradle checkstyleTest

This PR also contains a fix for a bug that `checkstyle` found (3cf2712).

Should this be run automatically? Right now it's not...