8413 and 8373 related changes

See #8413 and #8373 

- [x] check coverage, especially the handling of duplicate args by Xor and Equivalent

(If anybody would like to take this over, that would be fine with me.)
I thought of that. I didn't want to make canonical do more than necessary. But this is a really fast test and operation, so perhaps it's ok to roll into canonical.