Simplify listeners using {Tid, Ref} tuples
Improve comments