Reformatting
Fix up wiring so that it can coexist with other eventstores, eventstore sessions etc.