Started to implement a segmented index for the vector iterator. Not done yet - just taking a snapshot
Partially revert latest changes. Indexing is now based on global index again.