Update support for events.

key is only used once so it can be constructed inside the ExtractList call below