Keep y a Py_hash_t instead of Py_uhash_t as it is compared with == -1 and the

compiler logic will do the right thing with just x as a Py_uhash_t.  This
matches what was already done in the 3.3 version.

cleanup only - no functionality or hash values change.