Clarify the logic on retry a little