Moving capture-avoiding subst to separate branch