Fixing more checkstyle errors.