Some checkstyle fixes.