Key handling improvements (prompted by HSS IPT persistence)
Provide some facilities that IPT persistence wants, and deal with some things I noticed on the way.
Provide some facilities that IPT persistence wants, and deal with some things I noticed on the way.