extensive changes working towards internalizing the tree click handling and
reducing the helper footprint