Made the change for retries.  So it's not quite this location, but really close, down in the retry clause below, that I moved the update_subtask_status down into the subtask_retry method, before the actual task retry call.