Make the paginator less gross.

cc. #100.