Use async functions (we should probably have created a new branch...).