[cvs-nhc98] Refactor, replacing Unset command with Set, but pushing th