Some tox_wait_* improvements