Simplify tree.hh