Generalized the axiom unification routine: if trigger terms are manually defined, can sometimes match axioms where not all variables are in functions. Todo: Needs a better interface.