Rework initialization so storage errors and only storage errors are retried indefinitely.