Merge "Account for early exit loop."