Updated CommentTree logic.