Less automatical evaluation for Equality, improve simplification

fixes #6116

see also #7960
> I think line 88 and 89 should be

Again.  This code was just moved around.

> Another comment on line 89. Are we confident this will always return true/false?

Yes.