Add more subst and lift lemmas