Finish moving scrapes into separate functions.