follow up - prevent callback redefinition and fix a typo in EventEmitter