issue #21511: Need to sort for renumbering to work right consistently.