added a more sensible way of avoiding usless eta-expansions when instantiating an evar