Make the error-check retry use the same args.
Make the error-check retry use the same args.

Previously it just used some of them..

Change-Id: I62cf0a967e3aa5d68c5f06177a629006d66fcd81

jmorse/cyanide,jmorse/cyanide,jmorse/cyanide,jmorse/cyanide