Improved non-idempotent retry

Incremental improvement to this area... making the language a bit clearer and stronger...