Correctly Resolves Crossed Connections When Boxed

Will deal with unboxed heuristics next.