More deduplicator stuff. At this point, it's just a question of doing some set-intersection stuff, but I need to think about it more.