Reintroduce support for intersection snapping