Fixing makefile generation issues.
Async/wait sequentialization more-or-less complete.