Stricter handling of property keys for uniquing