You did not respond to this comment in the other pull request, so I copied it to this pull request:

The `(repeating-)?` expressions should use non-capturing parenthesis `(?:repeating-)?` so they are not added to the match array. We don't use that info, and then the array indexes won't need to be changed.