Corrections made after review: clean out all keys at startup, don't set
up-to-date-key until really up to date.