More clean-up of the clock persistence code.