More Checkstyle fixes.