Remove unneeded grouping from regular expression (performance improvement)