Thinking about future directions some more I think I'll forget about Context for now and forget about the templatized deduplicate. I will however fix the comparison order and keep operator== and operator<. http://llvm-reviews.chandlerc.com/D1415