More checkstyle cleanups.