Wrap existing regular expression rather than modifying it

Addresses PR feedback. This now allows for both proper single- and
multi-matching.