Partial move back to channel-based eventing.