The only change here is that if we run off the end of the loop in a way
that previously would have just hung, we return silently.