Making wait_* just wait and return nothing