Fix overriding of Relation#where_values_hash