Fix issues with the prior commit on this branch.  The small-stack
non-recursive implementation appears to be working.
Ticket [2a1e8e3c4b0b39e08fdde].