events: get rid of _eventsCount property

lib/events.js

@@ -30,10 +30,8 @@ EventEmitter.init = function() {
     }
   }
 
-  if (!this._events || this._events === Object.getPrototypeOf(this)._events) {
+  if (!this._events || this._events === Object.getPrototypeOf(this)._events)
     this._events = new Map();
-    this._eventsCount = 0;
-  }
 
   this._maxListeners = this._maxListeners || undefined;
 };
@@ -199,7 +197,6 @@ EventEmitter.prototype.addListener = function addListener(type, listener) {
   events = this._events;
   if (!events) {
     events = this._events = new Map();
-    this._eventsCount = 0;
   } else {
     // To avoid recursion in the case that type === "newListener"! Before
     // adding it to the listeners, first emit "newListener".
@@ -217,7 +214,6 @@ EventEmitter.prototype.addListener = function addListener(type, listener) {
   if (!existing) {
     // Optimize the case of one listener. Don't need the extra array object.
     events.set(type, listener);
-    ++this._eventsCount;
   } else {
     if (typeof existing === 'function') {
       // Adding the second element, need to change to array.
@@ -285,13 +281,9 @@ EventEmitter.prototype.removeListener =
         return this;
 
       if (list === listener || (list.listener && list.listener === listener)) {
-        if (--this._eventsCount === 0)
-          this._events.clear();
-        else {
-          events.delete(type);
-          if (events.has('removeListener'))
-            this.emit('removeListener', type, listener);
-        }
+        events.delete(type);
+        if (events.has('removeListener'))
+          this.emit('removeListener', type, listener);
       } else if (typeof list !== 'function') {
         position = -1;
 
@@ -308,12 +300,7 @@ EventEmitter.prototype.removeListener =
 
         if (list.length === 1) {
           list[0] = undefined;
-          if (--this._eventsCount === 0) {
-            this._events.clear();
-            return this;
-          } else {
-            events.delete(type);
-          }
+          events.delete(type);
         } else {
           spliceOne(list, position);
         }
@@ -335,15 +322,10 @@ EventEmitter.prototype.removeAllListeners =
 
       // not listening for removeListener, no need to emit
       if (!events.has('removeListener')) {
-        if (arguments.length === 0) {
-          this._events.clear();
-          this._eventsCount = 0;
-        } else if (events.has(type)) {
-          if (--this._eventsCount === 0)
-            this._events.clear();
-          else
-            events.delete(type);
-        }
+        if (arguments.length === 0)
+          events.clear();
+        else
+          events.delete(type);
         return this;
       }
 
@@ -354,8 +336,7 @@ EventEmitter.prototype.removeAllListeners =
           this.removeAllListeners(key);
         }
         this.removeAllListeners('removeListener');
-        this._events.clear();
-        this._eventsCount = 0;
+        events.clear();
         return this;
       }