Fixing the pattern matching to truly match regexp.  In other words, dropping Str::is()