[overlapping-features] Insert seems to work again.

Put more work in to keeping track of indices. Hopefully will be more stable for
the future.