Bring retry logic semantics up to spec