Fixup checkstyle problems.