Refactor SUBST to use COND