Moved spine to be local to whnf
moved subst to be local to whnf