Continuation of hating checkstyle.

I would have amended the last commit, but I had Commit & Sync turned on.