[FORMATTING] Fix some newly introduced checkstyle issues.