More care in KeyRing dump