Clean up and find a better home for this

embrio might be a better place since it already has a number of async utilities.