Refactor EventPersistenceQueue.