Small cleanup in 'set page'
Merge pull request #4043 from Snuffleupagus/set-page-cleanup

Small cleanup in 'set page'