Tweaked async handling to be more concise.