aligned with newest asyncmachine, seems to fix the disappearing control flow bug
cleanups