Clean up silly waitgroup handling in tools/traverse