rc01: Persistence code clean-up.