simplify waiting on grandchildren

This should be just a refactoring. Less `&` background
stuff and more straightforward linear logic.