Merge "Simplify TreeInfo"