Minor scraper refactor.