Plumbing and refactoring around EventTypes