Fixes more checkstyle violations.