I have removed the `make_distinct` argument, it now always acts if this were `True`, and trimmed the tests appropriately.