I'm gonna pass on this change to regcomp, since it's in debug-only code. Can you drop it so I can merge the other fixes? Thanks!