Checkstyle 6.0 and minor cleanups therefor