Can we make these available for untyped trees, too?