Fix another bug with TokensRegex wrapper grouping