The deduplication of properties now seems to cover the non-indexed cases.
milestone on using indexes for duplicate property conflict resolution