Lots more of the pagination changes for a while...