Refactor -retry: and -repeat to honor early disposal
Test error handling with -repeat
Tests for -retry: