hand: General tidy of the async code.