Improved handling of no-more-scrolling-avaiable.