Some changes to the async framework.