fixup! events: refactor to use more primordials

This reverts commit e3d0bb1.

lib/events.js

@@ -497,13 +497,22 @@ EventEmitter.prototype.prependListener =
       return _addListener(this, type, listener, true);
     };
 
-function _onceWrap(target, type, listener) {
-  return function onceWrapper() {
-    target.removeListener(type, onceWrapper);
+function onceWrapper() {
+  if (!this.fired) {
+    this.target.removeListener(this.type, this.wrapFn);
+    this.fired = true;
     if (arguments.length === 0)
-      return FunctionPrototypeCall(listener, target);
-    return ReflectApply(listener, target, arguments);
-  };
+      return FunctionPrototypeCall(this.listener, this.target);
+    return ReflectApply(this.listener, this.target, arguments);
+  }
+}
+
+function _onceWrap(target, type, listener) {
+  const state = { fired: false, wrapFn: undefined, target, type, listener };
+  const wrapped = FunctionPrototypeBind(onceWrapper, state);
+  wrapped.listener = listener;
+  state.wrapFn = wrapped;
+  return wrapped;
 }
 
 EventEmitter.prototype.once = function once(type, listener) {
@@ -791,7 +800,7 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
 }
 
 function on(emitter, event, options) {
-  const signal = options?.signal;
+  const { signal } = { ...options };
   validateAbortSignal(signal, 'options.signal');
   if (signal && signal.aborted) {
     throw lazyDOMException('The operation was aborted', 'AbortError');