Can you rebase on 182a237fa77185ebb823e0f97ae3fa13abe4421a? In particular, move some of this logic into `getEventKey`.