Be more explicit about what we're waiting for, among other changes.
This appears to fully correct the wait issues.