Improve unification error messages (again) (push to 6.6 branch)