Fix remainder of bug 1605 so that when snapping to region starts / ends, the crossove...