FIX: tidy up TcSimplify following equality constraints additions