Drop TERMS-WITH-FUNCTOR (we never use it).