Minor refactoring of pager