A more general approach to subst- with more difficult lemmas to prove