Support for reading 2.1 log files and upgrading from 2.1 store files

There's `assertSame`. Makes _yes, I really want to compare identity_ explicit.