Start tidying up Store interface.
Merge branch 'master' of github.com:dw/acid