Add back early termination, but with a more sensible condition.