It seems like a huge change in behaviour to have nested operations here.

I'm suspicious that it only requires these two changes, and anticipate
the entire mechanism can't be moved from singular to nested with just
this.  That prompts the questions:  How did we get here, and is this
viable recursion???  I strongly suspect no.