Reduce intact ranges, rather than extending change ranges, for collapsed spans

This way, we don't have to shuffle coordinate systems.

Closes #1255
[q mode] Remove unused variables