Checkstyle/3.x/spi

Second round of Checkstyle compliance SPI.

Next round contains cleanup for whatever else is missing.