Less automatical evaluation for Equality, improve simplification

fixes #6116

see also #7960