Greatly simplify makeNewPaginationChoices
Greatly simplify makeNewPaginationChoices

Also added two developer-only choices.

Patch by: Sverre Rabbelier

MatthewWilkes/mw4068-packaging,MatthewWilkes/mw4068-packaging,MatthewWilkes/mw4068-packaging,MatthewWilkes/mw4068-packaging