Fix some checkstyle nits.