Completed factoring out the one-step-recovery as being optional.