Simplify WaitGroup handling