ENH Reduce number of iterations in active wait

Before, this could wait for hours, limiting the value of even having a
limit.