Simplify / fix EventEmitter shim