- let _, uri, _ = entity in
- K.add env uri entity; entity
+IFDEF EXPAND THEN
+ let ra, na, uri, b = entity in
+ let entity0 = if !G.expand then ra, E.node_attrs ~apix:0 (), uri, b else entity in
+ UH.add env uri entity0; entity
+ELSE
+ let _, _, uri, _ = entity in
+ UH.add env uri entity; entity
+END