There are basically two changes here:

- Make the argument to prepareDiffData an object so that
    the arguments list isn't unwieldy (majority of changes)
- Skip identifying diff files when the preparation is for metadata,
    since those diff "files" don't have uniquely identifying data