Mechanism for event delivery is working in both directions; need to tidy up the interface.