Round one of spi checkstyle compliance

I think we get a lot of syntactical noise if we do that. I'm not in favor using using //CHECKSTYLE:OFF for empty blocks.