Change the async_await.dart API back to the original.
A few small cleanups.