EventStoreLayer: Refactor some copy and paste