Simplify download thread waiting