Further work in preparation for making BMS and data offsets in index into 8-byte ints in version 2 of the index format#694