update xhash
update xhash uses
Merge branch 'update-xhash'
separate macroexpansion and arena management