-/* #### Some implementations multiply the hash with the "golden ratio"
- of the table to get better spread for keys that do not come from a
- good hashing source. I'm not sure if that is necessary for the
- hash functions we use. */
-
-#define HASH_POSITION(ht, key) (ht->hash_function (key) % ht->size)
+/* Return the position of KEY in hash table SIZE large, hash function
+ being HASHFUN. #### Some implementations multiply HASHFUN's output
+ with the table's "golden ratio" to get better spreading of keys.
+ I'm not sure if that is necessary with our hash functions. */
+#define HASH_POSITION(key, hashfun, size) ((hashfun) (key) % size)