.

wcfs/internal/xbtree.py

@@ -247,7 +247,7 @@ def Restructure(ztree, newStructure):
     assert _.is_ztree
     assert isinstance(newStructure, Tree)
 
-    from_ = TopoEncode(StructureOf(ztree))
+    from_ = TopoEncode(StructureOf(ztree, onlyKeys=True))
     to_   = TopoEncode(newStructure)
     """
     def _():

wcfs/internal/xbtree_test.py

@@ -482,9 +482,9 @@ def test_restructure():
         for (k,v) in items:
             assert ztree[k] == v
 
-    # S returns topo-encoded structure of ztree
+    # S returns topo-encoded keys-only structure of ztree
     def S(ztree):
-        return xbtree.TopoEncode(xbtree.StructureOf(ztree))
+        return xbtree.TopoEncode(xbtree.StructureOf(ztree, onlyKeys=True))
 
     # Z0 creates new empty tree
     def Z0():