Many checkstyle fixes.