More refactoring around async/mult