More work on getting rid of awaiter as parameter