Fix #777: Slow deduplication