Merge: Beef up OrderedTree API