Rewrite use of subst.