Checkstyle and related fixes.