Update to work with the recent emitter change.