Simplify: use QTRY_* instead of manual waiting

This is usually less code and has the chance to run faster when
the result comes in before our hardcoded previous timeout.