Bring back PaginateChoiceState for issue list.

But this time using ``options_per_page`` (set to 6) since that doesn't suffer from the length calculating bug that auto-pagination does.