Swapped home-rolled hashing for DataHash.

Made changes in approporate places.