Minor hashing refactoring.