Make the index/name hashes not pointers.