Scraper refactor.

Could be better but time to focus on the restaurant scrapers lest we want to
starve next year. :(