+1, I intend to address this in a separate commit (after we land event emitter).