Improve fixes for #1453: Promote the logic to AsyncSupport