Yeah, I think you're right. I plan a later optimisation for these waits to avoid such issues, but I'll reuse the timeout for now as you suggest.