More async improvements and code cleanup.