And improve it in various ways. In particular, make the main thread iterations continue until both thread{1,2} are seen, so we don’t rely on the scheduler to schedule them both enough within the fixed number of iterations we’d specified.
This should allow a Debian downstream patch to be removed, hopefully.
It helps #1434 (closed).