Use the same hashword2 function for both uint16_t and uint64_t types.

The original uint16_t version of hashword2 was not very good at all.