Remove tags from mapping
Nit changes from review, safely use promised emitters for promise.js deprecation, decoupling
Use new signature of emitters/promises