I was more concerned in this PR about handling the time-related retry logic and making update calls in general. my next step is to deal more intentionally with the various image status values that might be encountered and so this whole section of logic will see changes. so if it's OK with you, I'd like to defer acting on this comment until I get to handling all the statuses since whatever I would do here will likely change anyway.