The retry-logic we add makes some steps awkward, especially when they
really are about verifying the results of some previous steps. Any way,
let's make the best out of it.