Consistent options for paginated states

Currently, `PaginatedChoiceState` has its 'more' choice first, `PaginatedState` doesn't.