Minor rework for the persistency option handling.