Minor tweaks to the event bus API, and adapted the existing classes (mainly ClientSession) to use them. Also did more work on Zone.