Fix some checkstyle warnings.