-let set_entity f (ra, na, uri, b) =
- let age = get_age () in
- let entry = ra, {na with E.n_apix = age}, uri, b in
- UH.add env uri entry; f entry
+let set_entity f 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; f entity
+ELSE
+ let _, _, uri, _ = entity in
+ UH.add env uri entity; f entity
+END