For the 401 at least, I think we should retry only on the first command, since 401's will not happen if a previous command returned a 200.