Keyed refactoring
Moved distinctness interfaces
Moved distinctness interfaces