Update to new functional everything-is-a-tree syntax