Working more on bringing up all the older deduplication tools up to date with my new APIs.