Add uniqueness predicates for MATCH patterns
Add code for expand that expands into already existing patterns