The proxy should be able to reuse a store on initialization. Minor cleanup to make experimentation with the proxy easier.