Revert "Revert "Coincident constraint representation: Fix in presence of ellipses and arcsofellipse""

This reverts commit 425d6cab65428d1f1b9914e26e50215f3499c203.