Improved non-page-numbers.