Yet more work on events.