Improve the fix for #9131. We were previously counting passes

Improve the fix for #9131. We were previously counting passes
through this routine, which means: one for every character, more
or less. So long strings would hit the "recursion limit". But what
we are worried about is an infinite loop caused by misues of macros,
so that is what we need to count.