Move deduping/merging to EventList