Oh, right.  Well, TBH, I plan to remove this whole codepath after I fix the error message issue.  I was mostly just trying to fix the problem @pvlugter reported of "loosing control of the terminal after an error".  This was one aspect that was a bit subtle.  Haven't properly fixed yet. I can do so before merging this pr though.  I'll go hack on that now.