In solve_evar_evar, orient the heuristic over arities with different
types as it was before commit 710bae2a8c81a44.

There is still at least one problem with bug #3392 to solve.
Updading test-suite.
Slight improving of a unification error message.