EventStoreLayer: Another optimization. Benchmarks later.