Adapt to using persistently interleaved keys