Reworked async callback handling.
Merge.