Make the remapping of interval indices (particularly ending indices) more robust.

This is tricky business, and will probably take a few more iterations to get
the last kinks out of it.

llvm-svn: 54043