Refactor to simplify ObjectOnDisk a little.