tweaks to async-await & deferred loading code

Tweaks related to https://chromiumcodereview.appspot.com/789393002/.