Reordered persistence lookups and boundaries (Closes: #500672).