Much more checkstyle cleanup.