- More cleanup of wait.c