X-Git-Url: http://nitlanguage.org

diff --git a/tests/sav/neo_doxygen_dump_args4.res b/tests/sav/neo_doxygen_dump_args4.res
index 6ceb76f..55f5dcb 100644
--- a/tests/sav/neo_doxygen_dump_args4.res
+++ b/tests/sav/neo_doxygen_dump_args4.res
@@ -22,8 +22,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 
 Edge
@@ -36,8 +36,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Node
 =labels=Array(3):
@@ -49,6 +49,50 @@ Edge
 
 
 Edge
+=type=6:PARENT
+=properties=JsonObject(0):
+{}
+----
+=from=Entity#12:namespaceorg
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
+----
+=to=Entity#0:
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"foo"}
+
+
+Edge
+=type=5:NESTS
+=properties=JsonObject(0):
+{}
+----
+=from=Entity#0:
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"foo"}
+----
+=to=Entity#12:namespaceorg
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
+
+
+Edge
 =type=8:DECLARES
 =properties=JsonObject(0):
 {}
@@ -58,16 +102,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","full_name":"org::example::foo::A","name":"A"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A"}
 
 
 Edge
@@ -80,16 +124,16 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","full_name":"org::example::foo::A","name":"A"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A"}
 ----
 =to=Entity#32:classorg_1_1example_1_1foo_1_1_a
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"abstract class","visibility":"public","full_name":"org::example::foo::A","name":"A","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1"}
+=properties=JsonObject(4):
+{"kind":"abstract class","visibility":"public","name":"A","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1"}
 
 
 Edge
@@ -102,16 +146,16 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","full_name":"org::example::foo::A","name":"A"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:1,1--1,1","name":"A"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1","is_intro":true,"name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1","is_intro":true,"name":"A"}
 
 
 Edge
@@ -124,16 +168,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","full_name":"org::example::foo::B","name":"B"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B"}
 
 
 Edge
@@ -146,16 +190,16 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","full_name":"org::example::foo::B","name":"B"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B"}
 ----
 =to=Entity#32:classorg_1_1example_1_1foo_1_1_b
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"org::example::foo::B","name":"B","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"B","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1"}
 
 
 Edge
@@ -168,16 +212,16 @@ Edge
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","full_name":"org::example::foo::B","name":"B"}
+=properties=JsonObject(2):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:1,1--1,1","name":"B"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B"}
 
 
 Edge
@@ -190,8 +234,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -199,7 +243,7 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","full_name":"org::example::foo::C","name":"C"}
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C","mdoc":["An interface"]}
 
 
 Edge
@@ -213,15 +257,15 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","full_name":"org::example::foo::C","name":"C"}
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C","mdoc":["An interface"]}
 ----
 =to=Entity#36:interfaceorg_1_1example_1_1foo_1_1_c
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(6):
-{"kind":"interface","visibility":"public","full_name":"org::example::foo::C","name":"C","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","mdoc":["An interface"]}
+=properties=JsonObject(5):
+{"kind":"interface","visibility":"public","name":"C","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","mdoc":["An interface"]}
 
 
 Edge
@@ -235,15 +279,15 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","full_name":"org::example::foo::C","name":"C"}
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:1,1--1,1","name":"C","mdoc":["An interface"]}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","full_name":"org::example::foo::C","mdoc":["An interface"]}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","mdoc":["An interface"]}
 
 
 Edge
@@ -256,8 +300,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -265,7 +309,7 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","full_name":"org::example::foo::EmptyClass","name":"EmptyClass"}
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass","mdoc":["This class is empty and is only visible in this package."]}
 
 
 Edge
@@ -279,15 +323,15 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","full_name":"org::example::foo::EmptyClass","name":"EmptyClass"}
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass","mdoc":["This class is empty and is only visible in this package."]}
 ----
 =to=Entity#42:classorg_1_1example_1_1foo_1_1_empty_class
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(6):
-{"kind":"class","visibility":"package","full_name":"org::example::foo::EmptyClass","name":"EmptyClass","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","mdoc":["This class is empty and is only visible in this package."]}
+=properties=JsonObject(5):
+{"kind":"class","visibility":"package","name":"EmptyClass","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","mdoc":["This class is empty and is only visible in this package."]}
 
 
 Edge
@@ -301,15 +345,15 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","full_name":"org::example::foo::EmptyClass","name":"EmptyClass"}
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:1,1--1,1","name":"EmptyClass","mdoc":["This class is empty and is only visible in this package."]}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","is_intro":true,"name":"EmptyClass","full_name":"org::example::foo::EmptyClass","mdoc":["This class is empty and is only visible in this package."]}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","is_intro":true,"name":"EmptyClass","mdoc":["This class is empty and is only visible in this package."]}
 
 
 Edge
@@ -369,8 +413,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(9):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:22,1--1,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","mdoc":["Does something..."],"is_intro":true,"full_name":"org::example::foo::A::bar"}
+=properties=JsonObject(8):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:22,1--1,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","mdoc":["Does something..."],"is_intro":true}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -378,8 +422,8 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"bar","full_name":"org::example::foo::A::bar"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"bar"}
 
 
 Edge
@@ -393,8 +437,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(9):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:22,1--1,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","mdoc":["Does something..."],"is_intro":true,"full_name":"org::example::foo::A::bar"}
+=properties=JsonObject(8):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:22,1--1,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","mdoc":["Does something..."],"is_intro":true}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -532,8 +576,8 @@ Edge
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"abstract class","visibility":"public","full_name":"org::example::foo::A","name":"A","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1"}
+=properties=JsonObject(4):
+{"kind":"abstract class","visibility":"public","name":"A","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -541,8 +585,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(1):
+{"name":"A"}
 
 
 Edge
@@ -556,16 +600,16 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(1):
+{"name":"A"}
 ----
 =to=Entity#32:classorg_1_1example_1_1foo_1_1_a
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"abstract class","visibility":"public","full_name":"org::example::foo::A","name":"A","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1"}
+=properties=JsonObject(4):
+{"kind":"abstract class","visibility":"public","name":"A","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1"}
 
 
 Edge
@@ -578,8 +622,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1","is_intro":true,"name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1","is_intro":true,"name":"A"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -587,8 +631,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(1):
+{"name":"A"}
 
 
 Edge
@@ -601,16 +645,16 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1","is_intro":true,"name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1","is_intro":true,"name":"A"}
 ----
 =to=Entity#32:classorg_1_1example_1_1foo_1_1_a
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"abstract class","visibility":"public","full_name":"org::example::foo::A","name":"A","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1"}
+=properties=JsonObject(4):
+{"kind":"abstract class","visibility":"public","name":"A","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1"}
 
 
 Edge
@@ -623,8 +667,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1","is_intro":true,"name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1","is_intro":true,"name":"A"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -632,8 +676,8 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"bar","full_name":"org::example::foo::A::bar"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"bar"}
 
 
 Edge
@@ -647,16 +691,16 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"bar","full_name":"org::example::foo::A::bar"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"bar"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1","is_intro":true,"name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1","is_intro":true,"name":"A"}
 
 
 Edge
@@ -669,8 +713,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1","is_intro":true,"name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:18,1--23,1","is_intro":true,"name":"A"}
 ----
 =to=Entity#67:classorg_1_1example_1_1foo_1_1_a_1add415ae4129969055d678c7e7e048852
 =labels=Array(4):
@@ -678,8 +722,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(9):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:22,1--1,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","mdoc":["Does something..."],"is_intro":true,"full_name":"org::example::foo::A::bar"}
+=properties=JsonObject(8):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:22,1--1,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","mdoc":["Does something..."],"is_intro":true}
 
 
 Edge
@@ -693,8 +737,8 @@ Edge
 7:MEntity
 8:MPropDef
 13:MAttributeDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:19,1---1,1","visibility":"protected","name":"qux","is_intro":true,"full_name":"org::example::foo::B::qux"}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:19,1---1,1","visibility":"protected","name":"qux","is_intro":true}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -702,8 +746,8 @@ Edge
 7:MEntity
 9:MProperty
 10:MAttribute
-=properties=JsonObject(3):
-{"visibility":"protected","name":"qux","full_name":"org::example::foo::B::qux"}
+=properties=JsonObject(2):
+{"visibility":"protected","name":"qux"}
 
 
 Edge
@@ -717,8 +761,8 @@ Edge
 7:MEntity
 8:MPropDef
 13:MAttributeDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:19,1---1,1","visibility":"protected","name":"qux","is_intro":true,"full_name":"org::example::foo::B::qux"}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:19,1---1,1","visibility":"protected","name":"qux","is_intro":true}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -787,8 +831,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(8):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:21,1--23,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","is_intro":true,"full_name":"org::example::foo::B::bar"}
+=properties=JsonObject(7):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:21,1--23,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","is_intro":true}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -796,8 +840,8 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"bar","full_name":"org::example::foo::B::bar"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"bar"}
 
 
 Edge
@@ -811,8 +855,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(8):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:21,1--23,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","is_intro":true,"full_name":"org::example::foo::B::bar"}
+=properties=JsonObject(7):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:21,1--23,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","is_intro":true}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -951,8 +995,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(9):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:28,1--28,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"baz","mdoc":["Some overriden documentation."],"is_intro":false,"full_name":"org::example::foo::B::baz"}
+=properties=JsonObject(8):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:28,1--28,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"baz","mdoc":["Some overriden documentation."],"is_intro":false}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -960,8 +1004,8 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"baz","full_name":"org::example::foo::C::baz"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"baz"}
 
 
 Edge
@@ -975,8 +1019,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(9):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:28,1--28,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"baz","mdoc":["Some overriden documentation."],"is_intro":false,"full_name":"org::example::foo::B::baz"}
+=properties=JsonObject(8):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:28,1--28,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"baz","mdoc":["Some overriden documentation."],"is_intro":false}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1022,8 +1066,8 @@ Edge
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"org::example::foo::B","name":"B","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"B","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1031,8 +1075,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(1):
+{"name":"B"}
 
 
 Edge
@@ -1046,16 +1090,16 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(1):
+{"name":"B"}
 ----
 =to=Entity#32:classorg_1_1example_1_1foo_1_1_b
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"org::example::foo::B","name":"B","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"B","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1"}
 
 
 Edge
@@ -1068,8 +1112,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1077,8 +1121,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(1):
+{"name":"B"}
 
 
 Edge
@@ -1091,16 +1135,16 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B"}
 ----
 =to=Entity#32:classorg_1_1example_1_1foo_1_1_b
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(5):
-{"kind":"class","visibility":"public","full_name":"org::example::foo::B","name":"B","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1"}
+=properties=JsonObject(4):
+{"kind":"class","visibility":"public","name":"B","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1"}
 
 
 Edge
@@ -1113,8 +1157,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1122,8 +1166,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"A","full_name":"org::example::foo::A"}
+=properties=JsonObject(1):
+{"name":"A"}
 
 
 Edge
@@ -1136,8 +1180,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1145,8 +1189,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"C","full_name":"org::example::foo::C"}
+=properties=JsonObject(1):
+{"name":"C"}
 
 
 Edge
@@ -1159,8 +1203,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1168,8 +1212,8 @@ Edge
 7:MEntity
 9:MProperty
 10:MAttribute
-=properties=JsonObject(3):
-{"visibility":"protected","name":"qux","full_name":"org::example::foo::B::qux"}
+=properties=JsonObject(2):
+{"visibility":"protected","name":"qux"}
 
 
 Edge
@@ -1183,16 +1227,16 @@ Edge
 7:MEntity
 9:MProperty
 10:MAttribute
-=properties=JsonObject(3):
-{"visibility":"protected","name":"qux","full_name":"org::example::foo::B::qux"}
+=properties=JsonObject(2):
+{"visibility":"protected","name":"qux"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B"}
 
 
 Edge
@@ -1205,8 +1249,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B"}
 ----
 =to=Entity#67:classorg_1_1example_1_1foo_1_1_b_1ac6b627949b10b9357eefc0cafcae1d87
 =labels=Array(4):
@@ -1214,8 +1258,8 @@ Edge
 7:MEntity
 8:MPropDef
 13:MAttributeDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:19,1---1,1","visibility":"protected","name":"qux","is_intro":true,"full_name":"org::example::foo::B::qux"}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:19,1---1,1","visibility":"protected","name":"qux","is_intro":true}
 
 
 Edge
@@ -1228,8 +1272,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1237,8 +1281,8 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"bar","full_name":"org::example::foo::B::bar"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"bar"}
 
 
 Edge
@@ -1252,16 +1296,16 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"bar","full_name":"org::example::foo::B::bar"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"bar"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B"}
 
 
 Edge
@@ -1274,8 +1318,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B"}
 ----
 =to=Entity#67:classorg_1_1example_1_1foo_1_1_b_1a11e157943665cc9e3a9be1502ebeb3b5
 =labels=Array(4):
@@ -1283,8 +1327,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(8):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:21,1--23,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","is_intro":true,"full_name":"org::example::foo::B::bar"}
+=properties=JsonObject(7):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:21,1--23,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"bar","is_intro":true}
 
 
 Edge
@@ -1297,8 +1341,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B","full_name":"org::example::foo::B"}
+=properties=JsonObject(3):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:18,1--29,1","is_intro":true,"name":"B"}
 ----
 =to=Entity#67:classorg_1_1example_1_1foo_1_1_b_1a733f4e076f29c7d0c41ed258199ea1d9
 =labels=Array(4):
@@ -1306,8 +1350,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(9):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:28,1--28,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"baz","mdoc":["Some overriden documentation."],"is_intro":false,"full_name":"org::example::foo::B::baz"}
+=properties=JsonObject(8):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/B.java:28,1--28,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"baz","mdoc":["Some overriden documentation."],"is_intro":false}
 
 
 Edge
@@ -1320,8 +1364,8 @@ Edge
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(6):
-{"kind":"class","visibility":"package","full_name":"org::example::foo::EmptyClass","name":"EmptyClass","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","mdoc":["This class is empty and is only visible in this package."]}
+=properties=JsonObject(5):
+{"kind":"class","visibility":"package","name":"EmptyClass","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","mdoc":["This class is empty and is only visible in this package."]}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1329,8 +1373,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"EmptyClass","full_name":"org::example::foo::EmptyClass"}
+=properties=JsonObject(1):
+{"name":"EmptyClass"}
 
 
 Edge
@@ -1344,16 +1388,16 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"EmptyClass","full_name":"org::example::foo::EmptyClass"}
+=properties=JsonObject(1):
+{"name":"EmptyClass"}
 ----
 =to=Entity#42:classorg_1_1example_1_1foo_1_1_empty_class
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(6):
-{"kind":"class","visibility":"package","full_name":"org::example::foo::EmptyClass","name":"EmptyClass","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","mdoc":["This class is empty and is only visible in this package."]}
+=properties=JsonObject(5):
+{"kind":"class","visibility":"package","name":"EmptyClass","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","mdoc":["This class is empty and is only visible in this package."]}
 
 
 Edge
@@ -1366,8 +1410,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","is_intro":true,"name":"EmptyClass","full_name":"org::example::foo::EmptyClass","mdoc":["This class is empty and is only visible in this package."]}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","is_intro":true,"name":"EmptyClass","mdoc":["This class is empty and is only visible in this package."]}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1375,8 +1419,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"EmptyClass","full_name":"org::example::foo::EmptyClass"}
+=properties=JsonObject(1):
+{"name":"EmptyClass"}
 
 
 Edge
@@ -1389,16 +1433,16 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","is_intro":true,"name":"EmptyClass","full_name":"org::example::foo::EmptyClass","mdoc":["This class is empty and is only visible in this package."]}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","is_intro":true,"name":"EmptyClass","mdoc":["This class is empty and is only visible in this package."]}
 ----
 =to=Entity#42:classorg_1_1example_1_1foo_1_1_empty_class
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(6):
-{"kind":"class","visibility":"package","full_name":"org::example::foo::EmptyClass","name":"EmptyClass","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","mdoc":["This class is empty and is only visible in this package."]}
+=properties=JsonObject(5):
+{"kind":"class","visibility":"package","name":"EmptyClass","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/EmptyClass.java:21,1--21,1","mdoc":["This class is empty and is only visible in this package."]}
 
 
 Edge
@@ -1412,8 +1456,8 @@ Edge
 7:MEntity
 8:MPropDef
 13:MAttributeDef
-=properties=JsonObject(6):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:25,1---1,1","visibility":"public","name":"THE_ANSWER","mdoc":["\u000e2\u00080\u0009cAnswer to the Ultimate Question of Life, the Universe, and Everything.\u000e2\u00080\u0009c"],"is_intro":true,"full_name":"org::example::foo::C::THE_ANSWER"}
+=properties=JsonObject(5):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:25,1---1,1","visibility":"public","name":"THE_ANSWER","mdoc":["\u000e2\u00080\u0009cAnswer to the Ultimate Question of Life, the Universe, and Everything.\u000e2\u00080\u0009c"],"is_intro":true}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1421,8 +1465,8 @@ Edge
 7:MEntity
 9:MProperty
 10:MAttribute
-=properties=JsonObject(3):
-{"visibility":"public","name":"THE_ANSWER","full_name":"org::example::foo::C::THE_ANSWER"}
+=properties=JsonObject(2):
+{"visibility":"public","name":"THE_ANSWER"}
 
 
 Edge
@@ -1436,8 +1480,8 @@ Edge
 7:MEntity
 8:MPropDef
 13:MAttributeDef
-=properties=JsonObject(6):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:25,1---1,1","visibility":"public","name":"THE_ANSWER","mdoc":["\u000e2\u00080\u0009cAnswer to the Ultimate Question of Life, the Universe, and Everything.\u000e2\u00080\u0009c"],"is_intro":true,"full_name":"org::example::foo::C::THE_ANSWER"}
+=properties=JsonObject(5):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:25,1---1,1","visibility":"public","name":"THE_ANSWER","mdoc":["\u000e2\u00080\u0009cAnswer to the Ultimate Question of Life, the Universe, and Everything.\u000e2\u00080\u0009c"],"is_intro":true}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1460,8 +1504,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(9):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:30,1--1,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"baz","mdoc":["A function with implicit modifiers."],"is_intro":true,"full_name":"org::example::foo::C::baz"}
+=properties=JsonObject(8):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:30,1--1,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"baz","mdoc":["A function with implicit modifiers."],"is_intro":true}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1469,8 +1513,8 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"baz","full_name":"org::example::foo::C::baz"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"baz"}
 
 
 Edge
@@ -1484,8 +1528,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(9):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:30,1--1,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"baz","mdoc":["A function with implicit modifiers."],"is_intro":true,"full_name":"org::example::foo::C::baz"}
+=properties=JsonObject(8):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:30,1--1,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"baz","mdoc":["A function with implicit modifiers."],"is_intro":true}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1531,8 +1575,8 @@ Edge
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(6):
-{"kind":"interface","visibility":"public","full_name":"org::example::foo::C","name":"C","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","mdoc":["An interface"]}
+=properties=JsonObject(5):
+{"kind":"interface","visibility":"public","name":"C","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","mdoc":["An interface"]}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1540,8 +1584,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"C","full_name":"org::example::foo::C"}
+=properties=JsonObject(1):
+{"name":"C"}
 
 
 Edge
@@ -1555,16 +1599,16 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"C","full_name":"org::example::foo::C"}
+=properties=JsonObject(1):
+{"name":"C"}
 ----
 =to=Entity#36:interfaceorg_1_1example_1_1foo_1_1_c
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(6):
-{"kind":"interface","visibility":"public","full_name":"org::example::foo::C","name":"C","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","mdoc":["An interface"]}
+=properties=JsonObject(5):
+{"kind":"interface","visibility":"public","name":"C","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","mdoc":["An interface"]}
 
 
 Edge
@@ -1577,8 +1621,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","full_name":"org::example::foo::C","mdoc":["An interface"]}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","mdoc":["An interface"]}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1586,8 +1630,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"C","full_name":"org::example::foo::C"}
+=properties=JsonObject(1):
+{"name":"C"}
 
 
 Edge
@@ -1600,16 +1644,16 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","full_name":"org::example::foo::C","mdoc":["An interface"]}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","mdoc":["An interface"]}
 ----
 =to=Entity#36:interfaceorg_1_1example_1_1foo_1_1_c
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MClass
-=properties=JsonObject(6):
-{"kind":"interface","visibility":"public","full_name":"org::example::foo::C","name":"C","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","mdoc":["An interface"]}
+=properties=JsonObject(5):
+{"kind":"interface","visibility":"public","name":"C","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","mdoc":["An interface"]}
 
 
 Edge
@@ -1622,8 +1666,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","full_name":"org::example::foo::C","mdoc":["An interface"]}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","mdoc":["An interface"]}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1631,8 +1675,8 @@ Edge
 7:MEntity
 9:MProperty
 10:MAttribute
-=properties=JsonObject(3):
-{"visibility":"public","name":"THE_ANSWER","full_name":"org::example::foo::C::THE_ANSWER"}
+=properties=JsonObject(2):
+{"visibility":"public","name":"THE_ANSWER"}
 
 
 Edge
@@ -1646,16 +1690,16 @@ Edge
 7:MEntity
 9:MProperty
 10:MAttribute
-=properties=JsonObject(3):
-{"visibility":"public","name":"THE_ANSWER","full_name":"org::example::foo::C::THE_ANSWER"}
+=properties=JsonObject(2):
+{"visibility":"public","name":"THE_ANSWER"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","full_name":"org::example::foo::C","mdoc":["An interface"]}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","mdoc":["An interface"]}
 
 
 Edge
@@ -1668,8 +1712,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","full_name":"org::example::foo::C","mdoc":["An interface"]}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","mdoc":["An interface"]}
 ----
 =to=Entity#71:interfaceorg_1_1example_1_1foo_1_1_c_1a4e97061eb40b045e820de05b33c43d21
 =labels=Array(4):
@@ -1677,8 +1721,8 @@ Edge
 7:MEntity
 8:MPropDef
 13:MAttributeDef
-=properties=JsonObject(6):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:25,1---1,1","visibility":"public","name":"THE_ANSWER","mdoc":["\u000e2\u00080\u0009cAnswer to the Ultimate Question of Life, the Universe, and Everything.\u000e2\u00080\u0009c"],"is_intro":true,"full_name":"org::example::foo::C::THE_ANSWER"}
+=properties=JsonObject(5):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:25,1---1,1","visibility":"public","name":"THE_ANSWER","mdoc":["\u000e2\u00080\u0009cAnswer to the Ultimate Question of Life, the Universe, and Everything.\u000e2\u00080\u0009c"],"is_intro":true}
 
 
 Edge
@@ -1691,8 +1735,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","full_name":"org::example::foo::C","mdoc":["An interface"]}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","mdoc":["An interface"]}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -1700,8 +1744,8 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"baz","full_name":"org::example::foo::C::baz"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"baz"}
 
 
 Edge
@@ -1715,16 +1759,16 @@ Edge
 7:MEntity
 9:MProperty
 7:MMethod
-=properties=JsonObject(4):
-{"visibility":"public","is_init":false,"name":"baz","full_name":"org::example::foo::C::baz"}
+=properties=JsonObject(3):
+{"visibility":"public","is_init":false,"name":"baz"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","full_name":"org::example::foo::C","mdoc":["An interface"]}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","mdoc":["An interface"]}
 
 
 Edge
@@ -1737,8 +1781,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(5):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","full_name":"org::example::foo::C","mdoc":["An interface"]}
+=properties=JsonObject(4):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:21,1--31,1","is_intro":true,"name":"C","mdoc":["An interface"]}
 ----
 =to=Entity#71:interfaceorg_1_1example_1_1foo_1_1_c_1a28ac7ce349ebb3e4a7747a8dd951582b
 =labels=Array(4):
@@ -1746,8 +1790,8 @@ Edge
 7:MEntity
 8:MPropDef
 10:MMethodDef
-=properties=JsonObject(9):
-{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:30,1--1,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"baz","mdoc":["A function with implicit modifiers."],"is_intro":true,"full_name":"org::example::foo::C::baz"}
+=properties=JsonObject(8):
+{"location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/C.java:30,1--1,1","is_intern":false,"is_extern":false,"is_abstract":false,"visibility":"public","name":"baz","mdoc":["A function with implicit modifiers."],"is_intro":true}
 
 
 Edge
@@ -1760,8 +1804,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1777,65 +1821,21 @@ Edge
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#12:namespaceorg
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
-----
-=to=Entity#0:
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
-
-
-Edge
-=type=5:NESTS
-=properties=JsonObject(0):
-{}
-----
-=from=Entity#0:
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
-----
-=to=Entity#12:namespaceorg
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
-
-
-Edge
-=type=6:PARENT
-=properties=JsonObject(0):
-{}
-----
 =from=Entity#23:namespaceorg_1_1example
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Entity#12:namespaceorg
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 
 
 Edge
@@ -1848,16 +1848,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org","name":"org","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"org","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Entity#23:namespaceorg_1_1example
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 
 
 Edge
@@ -1870,8 +1870,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1892,16 +1892,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Entity#23:namespaceorg_1_1example
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 
 
 Edge
@@ -1914,16 +1914,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example","name":"example","location":"\/dev\/null:1,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"example","location":"\/dev\/null:1,1--1,1"}
 ----
 =to=Entity#30:namespaceorg_1_1example_1_1foo
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 
 
 Edge
@@ -1936,8 +1936,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(5):
-{"kind":"namespace","visibility":"","full_name":"org::example::foo","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
+=properties=JsonObject(4):
+{"kind":"namespace","visibility":"","name":"foo","location":"%SOURCE_DIRECTORY%\/org\/example\/foo\/A.java:16,1--1,1"}
 ----
 =to=Node
 =labels=Array(3):