Don't let the form of the argument to hash_data() leak into the
production of the hash-key.

Fixes	#1296