Clean up convert-to-async refactor (#36858)

* Start renaming some stuff, fix deep cloning identifiers, which apparently fixed some unnoticed bugs

* Wow a lot of stuff seems to be unused

Author: andrewbranch