simplification in category_hset
full needs squash, some more implicit arguments
Merge branch 'master' into mscs