More work on Object Tree.