Fix LEAVE not firing on next/last in MapIter.

Done as an attempted/failed fix for something else.
Fixes to work with the invokewithcapture changes.

With this, there's just one spectest (not file, just test) that seems
to be broken in this branch over nom.