Cleaned up the raw types in NAryTree.