Include scrape context in RaffleScrapingJob (new/update)
Various cleanup