The recursive stores now seem to work

It's also easier to embed key contents with a special merge semantics.