Refactor some Awaits out.