BUG-509: reorganize data tree abstractions.