Various changes, including abstracting LongStoreReader.