Updated version matching Regexp.