Added Set substitution, too.