Minor tidy-up.
Removed retries entirely. This just doesn't look like it can work at this level :(