Switched Hashable instances over to hashable from data-hash