Further simplification of the scraper.