Make on-disk index representation separate from in-core one