Represent the hash vectors more cleanly
Merge pull request #512 from alex/hash-cleanup

Represent the hash vectors more cleanly