Does the rest of the code depend on partitions being labeled contiguously?  If so, isn't that rather what we should fix?