Better cross-referencing on emit() and on()