Less automatical evaluation for Equality, improve simplification

fixes #6116

see also #7960
oh, sorry misread the code, that cannot happen here.  (I was planning to try to tackle this after #7960.)