This merge is turning out to be challenging.

Making a branch to handle the merge.
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.
Fix those pesky leading newlines.

Also pass all tests
compile the rest