Added hooks for custom property equivalence and disambiguation of definitions.