Avoid nonconfluence in hgeometry-combinatorial

  The existing behaviour relied on non-confluent behaviour
  in the constraint solver, which caused a problem
  when removing derived constraints