Rename room.events to be room.aevents to make it clearer that they store AnnotatedEvents
Use the new annotated events for all the things