More consistent usage of pointers with the hash table