Almost fixed!

The key was hacking the scope system on the outermost await.  I think
that's good enough for now, although we need a lot more testing.