Make recovery state transitions more explicit