Fix some annoying hash analysis bugs.