Refactor equality with tuples...