typespec fixes

* loosen the HMap.pri type
* more accurate HMap.token type