refactor insertIndexes
fix extendComposition/extendUnion: don't insertIndexes/bumpIndexes to
the added relation