Fix how regexes are matched back up with params.