The deduplication of properties now seems to cover the non-indexed cases.