Fix bad coroutine commits which prevent compilation when GENERIC_CORUTINES off