Delete khash_mask macro.
And fix expression to more simple and readable.
Merge pull request #2022 from ksss/khash-delete-khash_mask

Delete khash_mask macro