Update support for events.

Yeah, and if you do that, I don't think there's even really a need for separate maps.