Turns out I can eliminate NewXyzPager funcs.
Adjust callers again.