Further improve reliability of make_tree_from.