Fix some checkstyle bugs.