Fix retry actually making a real request.

Also fix errorCodes merging.
Bump version.