Retry now checks whether potential retry counts are undefined, rather than boolean, in order to avoid filtering out 0's#2958