Small cleanups to EPA scraper.