Some further small refactoring of the HierarchyTree