Finish moving away from HSets
WIP