Replace remaining possible uses of promises with async/await

Replace remaining possible uses of promises with async/await #547