Decouple Aggregate-Root from EventStream (a little)