D: remove dependency on EventEmitter