More checkstyle cleanup.