Merge "Rewrite BitVector index iterator."