Cleaning up coroutine headers