Treat deprecated and non-deprecated versions of keys as different for equality comparison

chose not to use `itertools.product` here?