If "capped retry errors" is the same as errors that are not INFINITE_RETRY_ERRORS, then yes.  If MAX_RETRIES is 5, then a task should be permitted five failures that are not INFINITE_RETRY_ERRORS.  So we need to increase the max_retries that is actually applied to a task so that it's not penalized for any of the retries that have occurred that were of the INFINITE_RETRY_ERRORS variety.  I'll try to improve the comment on this.