diff --git a/foo/.vscode/settings.json b/foo/.vscode/settings.json
index d5273b01..3cd417bf 100644
--- a/foo/.vscode/settings.json
+++ b/foo/.vscode/settings.json
@@ -1,4 +1,5 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-  "editor.lineNumbers": "on"
+  "editor.lineNumbers": "on",
+  "cquery.cacheDirectory": "C:/Users/jacob/AppData/Roaming/Code/User/workspaceStorage/ff57708adc5718d939d7a59c9d5270c7/jacobdufault.cquery/cquerycache/"
 }
\ No newline at end of file
diff --git a/foo/b.cc b/foo/b.cc
index cd5140fa..d13c8851 100644
--- a/foo/b.cc
+++ b/foo/b.cc
@@ -1,24 +1,17 @@
-//1
-//2
+struct Parent {
+  virtual void Method() = 0;
+};
+struct Derived : public Parent {
+  void Method() override {}
+};
 
 
+void Caller() {
+  Derived d;
+  Parent* p = &d;
+
+  p->Method();
+  d->Method();
+}
 
 
-//3
-//4
-void b(); //7
-
-
-
-void b(); //8
-//8
-//9
-//10
-//11
-//12
-
-
-//13
-void foo() {
-  b();
-}
\ No newline at end of file
diff --git a/src/position.cc b/src/position.cc
index 043b331f..3e835451 100644
--- a/src/position.cc
+++ b/src/position.cc
@@ -74,11 +74,6 @@ Range::Range(bool interesting, Position start, Position end) : interesting(inter
 Range::Range(const char* encoded) {
   end = start;
 
-  if (*encoded == '*') {
-    interesting = true;
-    ++encoded;
-  }
-
   start.line = atoi(encoded);
 
   encoded = SkipAfter(encoded, ':');
@@ -119,8 +114,6 @@ std::string Range::ToString() {
 
   std::string output;
 
-  if (interesting)
-    output += '*';
   output += std::to_string(start.line);
   output += ':';
   output += std::to_string(start.column);
diff --git a/tests/class_forward_declaration.cc b/tests/class_forward_declaration.cc
index 55f4f774..b669f4e9 100644
--- a/tests/class_forward_declaration.cc
+++ b/tests/class_forward_declaration.cc
@@ -13,7 +13,7 @@ OUTPUT:
       "detailed_name": "Foo",
       "definition_spelling": "3:7-3:10",
       "definition_extent": "3:1-3:13",
-      "uses": ["1:7-1:10", "2:7-2:10", "*3:7-3:10", "4:7-4:10"]
+      "uses": ["1:7-1:10", "2:7-2:10", "3:7-3:10", "4:7-4:10"]
     }]
 }
 */
diff --git a/tests/constructors/constructor.cc b/tests/constructors/constructor.cc
index 96cb36dd..3319f23d 100644
--- a/tests/constructors/constructor.cc
+++ b/tests/constructors/constructor.cc
@@ -20,7 +20,7 @@ OUTPUT:
       "definition_extent": "1:1-4:2",
       "funcs": [0],
       "instantiations": [0, 1],
-      "uses": ["*1:7-1:10", "3:3-3:6", "*7:3-7:6", "*8:3-8:6", "*8:17-8:20"]
+      "uses": ["1:7-1:10", "3:3-3:6", "7:3-7:6", "8:3-8:6", "8:17-8:20"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/constructors/destructor.cc b/tests/constructors/destructor.cc
index 0086be49..daadd770 100644
--- a/tests/constructors/destructor.cc
+++ b/tests/constructors/destructor.cc
@@ -25,7 +25,7 @@ OUTPUT:
       "definition_extent": "1:1-5:2",
       "funcs": [0, 1],
       "instantiations": [0],
-      "uses": ["*1:7-1:10", "3:3-3:6", "4:3-4:7", "*8:3-8:6"]
+      "uses": ["1:7-1:10", "3:3-3:6", "4:3-4:7", "8:3-8:6"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/constructors/invalid_reference.cc b/tests/constructors/invalid_reference.cc
index 5dda0e6c..fb000dfe 100644
--- a/tests/constructors/invalid_reference.cc
+++ b/tests/constructors/invalid_reference.cc
@@ -14,7 +14,7 @@ OUTPUT:
       "definition_spelling": "1:8-1:11",
       "definition_extent": "1:1-1:14",
       "funcs": [0],
-      "uses": ["*1:8-1:11", "4:6-4:9", "4:1-4:4"]
+      "uses": ["1:8-1:11", "4:6-4:9", "4:1-4:4"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/declaration_vs_definition/class.cc b/tests/declaration_vs_definition/class.cc
index ab46b5a5..c7290937 100644
--- a/tests/declaration_vs_definition/class.cc
+++ b/tests/declaration_vs_definition/class.cc
@@ -15,7 +15,7 @@ OUTPUT:
       "detailed_name": "Foo",
       "definition_spelling": "3:7-3:10",
       "definition_extent": "3:1-3:13",
-      "uses": ["1:7-1:10", "2:7-2:10", "*3:7-3:10", "4:7-4:10"]
+      "uses": ["1:7-1:10", "2:7-2:10", "3:7-3:10", "4:7-4:10"]
     }]
 }
 */
diff --git a/tests/declaration_vs_definition/class_member.cc b/tests/declaration_vs_definition/class_member.cc
index 677e299b..5716e0ba 100644
--- a/tests/declaration_vs_definition/class_member.cc
+++ b/tests/declaration_vs_definition/class_member.cc
@@ -13,7 +13,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-3:2",
       "vars": [0],
-      "uses": ["*1:7-1:10"]
+      "uses": ["1:7-1:10"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/declaration_vs_definition/class_member_static.cc b/tests/declaration_vs_definition/class_member_static.cc
index d431cf33..bb71cea4 100644
--- a/tests/declaration_vs_definition/class_member_static.cc
+++ b/tests/declaration_vs_definition/class_member_static.cc
@@ -15,7 +15,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-3:2",
       "vars": [0],
-      "uses": ["*1:7-1:10", "5:5-5:8"]
+      "uses": ["1:7-1:10", "5:5-5:8"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/declaration_vs_definition/method.cc b/tests/declaration_vs_definition/method.cc
index 040164db..e587903b 100644
--- a/tests/declaration_vs_definition/method.cc
+++ b/tests/declaration_vs_definition/method.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-5:2",
       "funcs": [0, 1, 2],
-      "uses": ["*1:7-1:10", "7:6-7:9"]
+      "uses": ["1:7-1:10", "7:6-7:9"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/enums/enum_class_decl.cc b/tests/enums/enum_class_decl.cc
index 25ceb902..a64669c0 100644
--- a/tests/enums/enum_class_decl.cc
+++ b/tests/enums/enum_class_decl.cc
@@ -14,7 +14,7 @@ OUTPUT:
       "definition_spelling": "1:12-1:15",
       "definition_extent": "1:1-4:2",
       "vars": [0, 1],
-      "uses": ["*1:12-1:15"]
+      "uses": ["1:12-1:15"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/enums/enum_decl.cc b/tests/enums/enum_decl.cc
index 67ec61f8..cbf5deb9 100644
--- a/tests/enums/enum_decl.cc
+++ b/tests/enums/enum_decl.cc
@@ -14,7 +14,7 @@ OUTPUT:
       "definition_spelling": "1:6-1:9",
       "definition_extent": "1:1-4:2",
       "vars": [0, 1],
-      "uses": ["*1:6-1:9"]
+      "uses": ["1:6-1:9"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/enums/enum_inherit.cc b/tests/enums/enum_inherit.cc
index 9ac29f11..b7db7867 100644
--- a/tests/enums/enum_inherit.cc
+++ b/tests/enums/enum_inherit.cc
@@ -14,7 +14,7 @@ OUTPUT:
       "definition_spelling": "1:6-1:9",
       "definition_extent": "1:1-4:2",
       "vars": [0, 1],
-      "uses": ["*1:6-1:9"]
+      "uses": ["1:6-1:9"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/enums/enum_usage.cc b/tests/enums/enum_usage.cc
index 6c104e57..e71591ef 100644
--- a/tests/enums/enum_usage.cc
+++ b/tests/enums/enum_usage.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "definition_extent": "1:1-4:2",
       "vars": [0, 1],
       "instantiations": [2],
-      "uses": ["*1:12-1:15", "*6:1-6:4", "6:9-6:12"]
+      "uses": ["1:12-1:15", "6:1-6:4", "6:9-6:12"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/foobar.cc b/tests/foobar.cc
index 8f111f66..839bf430 100644
--- a/tests/foobar.cc
+++ b/tests/foobar.cc
@@ -18,7 +18,7 @@ OUTPUT:
       "detailed_name": "A",
       "definition_spelling": "1:6-1:7",
       "definition_extent": "1:1-1:10",
-      "uses": ["*1:6-1:7", "*9:5-9:6"]
+      "uses": ["1:6-1:7", "9:5-9:6"]
     }, {
       "id": 1,
       "usr": "c:@E@B",
@@ -26,7 +26,7 @@ OUTPUT:
       "detailed_name": "B",
       "definition_spelling": "2:6-2:7",
       "definition_extent": "2:1-2:10",
-      "uses": ["*2:6-2:7", "*10:5-10:6"]
+      "uses": ["2:6-2:7", "10:5-10:6"]
     }, {
       "id": 2,
       "usr": "c:@ST>1#T@Foo",
@@ -35,7 +35,7 @@ OUTPUT:
       "definition_spelling": "5:8-5:11",
       "definition_extent": "5:1-7:2",
       "instantiations": [1],
-      "uses": ["*5:8-5:11", "*9:1-9:4", "*10:1-10:4"]
+      "uses": ["5:8-5:11", "9:1-9:4", "10:1-10:4"]
     }, {
       "id": 3,
       "usr": "c:@ST>1#T@Foo@S@Inner",
@@ -44,7 +44,7 @@ OUTPUT:
       "definition_spelling": "6:10-6:15",
       "definition_extent": "6:3-6:18",
       "instantiations": [0],
-      "uses": ["*6:10-6:15", "*9:9-9:14"]
+      "uses": ["6:10-6:15", "9:9-9:14"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/inheritance/class_inherit.cc b/tests/inheritance/class_inherit.cc
index c33f53f3..64e710cf 100644
--- a/tests/inheritance/class_inherit.cc
+++ b/tests/inheritance/class_inherit.cc
@@ -12,7 +12,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:13",
       "definition_extent": "1:1-1:16",
       "derived": [1],
-      "uses": ["*1:7-1:13", "*2:24-2:30"]
+      "uses": ["1:7-1:13", "2:24-2:30"]
     }, {
       "id": 1,
       "usr": "c:@S@Derived",
@@ -21,7 +21,7 @@ OUTPUT:
       "definition_spelling": "2:7-2:14",
       "definition_extent": "2:1-2:33",
       "parents": [0],
-      "uses": ["*2:7-2:14"]
+      "uses": ["2:7-2:14"]
     }]
 }
 */
diff --git a/tests/inheritance/class_inherit_templated_parent.cc b/tests/inheritance/class_inherit_templated_parent.cc
index e214310b..9c6759c1 100644
--- a/tests/inheritance/class_inherit_templated_parent.cc
+++ b/tests/inheritance/class_inherit_templated_parent.cc
@@ -23,7 +23,7 @@ OUTPUT:
       "definition_spelling": "2:7-2:12",
       "definition_extent": "2:1-2:15",
       "derived": [2, 5],
-      "uses": ["*2:7-2:12", "*8:18-8:23", "*13:17-13:22"]
+      "uses": ["2:7-2:12", "8:18-8:23", "13:17-13:22"]
     }, {
       "id": 1,
       "usr": "c:@ST>1#T@Base2",
@@ -32,7 +32,7 @@ OUTPUT:
       "definition_spelling": "5:7-5:12",
       "definition_extent": "5:1-5:15",
       "derived": [3, 5],
-      "uses": ["*5:7-5:12", "*11:18-11:23", "*13:27-13:32"]
+      "uses": ["5:7-5:12", "11:18-11:23", "13:27-13:32"]
     }, {
       "id": 2,
       "usr": "c:@ST>1#Ni@Derived1",
@@ -42,7 +42,7 @@ OUTPUT:
       "definition_extent": "8:1-8:29",
       "parents": [0],
       "derived": [5],
-      "uses": ["*8:7-8:15", "*13:43-13:51"]
+      "uses": ["8:7-8:15", "13:43-13:51"]
     }, {
       "id": 3,
       "usr": "c:@ST>1#T@Derived2",
@@ -52,11 +52,11 @@ OUTPUT:
       "definition_extent": "11:1-11:29",
       "parents": [1],
       "derived": [5],
-      "uses": ["*11:7-11:15", "*13:56-13:64"]
+      "uses": ["11:7-11:15", "13:56-13:64"]
     }, {
       "id": 4,
       "usr": "c:class_inherit_templated_parent.cc@154",
-      "uses": ["*11:24-11:25"]
+      "uses": ["11:24-11:25"]
     }, {
       "id": 5,
       "usr": "c:@S@Derived",
@@ -65,7 +65,7 @@ OUTPUT:
       "definition_spelling": "13:7-13:14",
       "definition_extent": "13:1-13:76",
       "parents": [0, 1, 2, 3],
-      "uses": ["*13:7-13:14", "*13:33-13:40", "*13:65-13:72"]
+      "uses": ["13:7-13:14", "13:33-13:40", "13:65-13:72"]
     }]
 }
 */
diff --git a/tests/inheritance/class_multiple_inherit.cc b/tests/inheritance/class_multiple_inherit.cc
index 0819294d..cb4d5e5e 100644
--- a/tests/inheritance/class_multiple_inherit.cc
+++ b/tests/inheritance/class_multiple_inherit.cc
@@ -14,7 +14,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:11",
       "definition_extent": "1:1-1:14",
       "derived": [1, 2],
-      "uses": ["*1:7-1:11", "*2:24-2:28", "*3:24-3:28"]
+      "uses": ["1:7-1:11", "2:24-2:28", "3:24-3:28"]
     }, {
       "id": 1,
       "usr": "c:@S@MiddleA",
@@ -24,7 +24,7 @@ OUTPUT:
       "definition_extent": "2:1-2:31",
       "parents": [0],
       "derived": [3],
-      "uses": ["*2:7-2:14", "*4:24-4:31"]
+      "uses": ["2:7-2:14", "4:24-4:31"]
     }, {
       "id": 2,
       "usr": "c:@S@MiddleB",
@@ -34,7 +34,7 @@ OUTPUT:
       "definition_extent": "3:1-3:31",
       "parents": [0],
       "derived": [3],
-      "uses": ["*3:7-3:14", "*4:40-4:47"]
+      "uses": ["3:7-3:14", "4:40-4:47"]
     }, {
       "id": 3,
       "usr": "c:@S@Derived",
@@ -43,7 +43,7 @@ OUTPUT:
       "definition_spelling": "4:7-4:14",
       "definition_extent": "4:1-4:50",
       "parents": [1, 2],
-      "uses": ["*4:7-4:14"]
+      "uses": ["4:7-4:14"]
     }]
 }
 */
diff --git a/tests/inheritance/function_override.cc b/tests/inheritance/function_override.cc
index c0bed684..7119dc9c 100644
--- a/tests/inheritance/function_override.cc
+++ b/tests/inheritance/function_override.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "definition_extent": "1:1-3:2",
       "derived": [1],
       "funcs": [0],
-      "uses": ["*1:7-1:11", "*4:24-4:28"]
+      "uses": ["1:7-1:11", "4:24-4:28"]
     }, {
       "id": 1,
       "usr": "c:@S@Derived",
@@ -27,7 +27,7 @@ OUTPUT:
       "definition_extent": "4:1-6:2",
       "parents": [0],
       "funcs": [1],
-      "uses": ["*4:7-4:14"]
+      "uses": ["4:7-4:14"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/inheritance/interface_pure_virtual.cc b/tests/inheritance/interface_pure_virtual.cc
index 13ba3661..be3f3041 100644
--- a/tests/inheritance/interface_pure_virtual.cc
+++ b/tests/inheritance/interface_pure_virtual.cc
@@ -13,7 +13,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:11",
       "definition_extent": "1:1-3:2",
       "funcs": [0],
-      "uses": ["*1:7-1:11"]
+      "uses": ["1:7-1:11"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/method_declaration.cc b/tests/method_declaration.cc
index 888a50fe..81cbe4b5 100644
--- a/tests/method_declaration.cc
+++ b/tests/method_declaration.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-3:2",
       "funcs": [0],
-      "uses": ["*1:7-1:10"]
+      "uses": ["1:7-1:10"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/method_definition.cc b/tests/method_definition.cc
index 657c054c..94fd1daa 100644
--- a/tests/method_definition.cc
+++ b/tests/method_definition.cc
@@ -15,7 +15,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-3:2",
       "funcs": [0],
-      "uses": ["*1:7-1:10", "5:6-5:9"]
+      "uses": ["1:7-1:10", "5:6-5:9"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/method_inline_declaration.cc b/tests/method_inline_declaration.cc
index 4fd36656..290c2fb6 100644
--- a/tests/method_inline_declaration.cc
+++ b/tests/method_inline_declaration.cc
@@ -13,7 +13,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-3:2",
       "funcs": [0],
-      "uses": ["*1:7-1:10"]
+      "uses": ["1:7-1:10"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/multi_file/impl.cc b/tests/multi_file/impl.cc
index aabd2e00..85e9cd4e 100644
--- a/tests/multi_file/impl.cc
+++ b/tests/multi_file/impl.cc
@@ -15,7 +15,7 @@ OUTPUT: header.h
       "definition_spelling": "3:8-3:12",
       "definition_extent": "3:1-3:15",
       "derived": [1],
-      "uses": ["*3:8-3:12", "*5:26-5:30"]
+      "uses": ["3:8-3:12", "5:26-5:30"]
     }, {
       "id": 1,
       "usr": "c:@S@SameFileDerived",
@@ -24,7 +24,7 @@ OUTPUT: header.h
       "definition_spelling": "5:8-5:23",
       "definition_extent": "5:1-5:33",
       "parents": [0],
-      "uses": ["*5:8-5:23", "*7:14-7:29"]
+      "uses": ["5:8-5:23", "7:14-7:29"]
     }, {
       "id": 2,
       "usr": "c:@Foo0",
@@ -33,7 +33,7 @@ OUTPUT: header.h
       "definition_spelling": "7:7-7:11",
       "definition_extent": "7:1-7:29",
       "alias_of": 1,
-      "uses": ["*7:7-7:11"]
+      "uses": ["7:7-7:11"]
     }, {
       "id": 3,
       "usr": "c:@ST>1#T@Foo2",
@@ -41,7 +41,7 @@ OUTPUT: header.h
       "detailed_name": "Foo2",
       "definition_spelling": "13:8-13:12",
       "definition_extent": "13:1-13:15",
-      "uses": ["*13:8-13:12"]
+      "uses": ["13:8-13:12"]
     }, {
       "id": 4,
       "usr": "c:@E@Foo3",
@@ -50,7 +50,7 @@ OUTPUT: header.h
       "definition_spelling": "15:6-15:10",
       "definition_extent": "15:1-15:22",
       "vars": [0, 1, 2],
-      "uses": ["*15:6-15:10"]
+      "uses": ["15:6-15:10"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/multi_file/static.cc b/tests/multi_file/static.cc
index d9efd4e5..4073f72c 100644
--- a/tests/multi_file/static.cc
+++ b/tests/multi_file/static.cc
@@ -13,7 +13,7 @@ OUTPUT: static.h
       "definition_spelling": "3:8-3:14",
       "definition_extent": "3:1-5:2",
       "funcs": [0],
-      "uses": ["*3:8-3:14"]
+      "uses": ["3:8-3:14"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/namespaces/method_declaration.cc b/tests/namespaces/method_declaration.cc
index dcac3f0c..db5560aa 100644
--- a/tests/namespaces/method_declaration.cc
+++ b/tests/namespaces/method_declaration.cc
@@ -15,7 +15,7 @@ OUTPUT:
       "definition_spelling": "2:7-2:10",
       "definition_extent": "2:1-4:2",
       "funcs": [0],
-      "uses": ["*2:7-2:10"]
+      "uses": ["2:7-2:10"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/namespaces/method_definition.cc b/tests/namespaces/method_definition.cc
index 247ad45a..abd93369 100644
--- a/tests/namespaces/method_definition.cc
+++ b/tests/namespaces/method_definition.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "definition_spelling": "2:7-2:10",
       "definition_extent": "2:1-4:2",
       "funcs": [0],
-      "uses": ["*2:7-2:10", "6:6-6:9"]
+      "uses": ["2:7-2:10", "6:6-6:9"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/namespaces/method_inline_declaration.cc b/tests/namespaces/method_inline_declaration.cc
index 69e919b2..ab6e5c5b 100644
--- a/tests/namespaces/method_inline_declaration.cc
+++ b/tests/namespaces/method_inline_declaration.cc
@@ -15,7 +15,7 @@ OUTPUT:
       "definition_spelling": "2:7-2:10",
       "definition_extent": "2:1-4:2",
       "funcs": [0],
-      "uses": ["*2:7-2:10"]
+      "uses": ["2:7-2:10"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/outline/outline.cc b/tests/outline/outline.cc
index a36cb354..c4bf92a8 100644
--- a/tests/outline/outline.cc
+++ b/tests/outline/outline.cc
@@ -18,12 +18,12 @@ OUTPUT:
       "definition_spelling": "3:8-3:23",
       "definition_extent": "3:1-7:2",
       "vars": [0, 1, 2],
-      "uses": ["*3:8-3:23"]
+      "uses": ["3:8-3:23"]
     }, {
       "id": 1,
       "usr": "c:@N@std@ST>2#T#T@vector",
       "instantiations": [2],
-      "uses": ["*6:8-6:14"]
+      "uses": ["6:8-6:14"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/outline/outline2.cc b/tests/outline/outline2.cc
index 0330ea87..42b49a12 100644
--- a/tests/outline/outline2.cc
+++ b/tests/outline/outline2.cc
@@ -23,17 +23,17 @@ OUTPUT:
       "definition_spelling": "6:8-6:24",
       "definition_extent": "6:1-10:2",
       "vars": [0, 1, 2],
-      "uses": ["*6:8-6:24", "*12:13-12:29"]
+      "uses": ["6:8-6:24", "12:13-12:29"]
     }, {
       "id": 1,
       "usr": "c:@N@std@T@string",
       "instantiations": [0, 1],
-      "uses": ["*7:8-7:14", "*8:8-8:14", "*9:20-9:26"]
+      "uses": ["7:8-7:14", "8:8-8:14", "9:20-9:26"]
     }, {
       "id": 2,
       "usr": "c:@N@std@ST>2#T#T@vector",
       "instantiations": [2],
-      "uses": ["*9:8-9:14", "*12:6-12:12"]
+      "uses": ["9:8-9:14", "12:6-12:12"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/templates/func_specialized_template_param.cc b/tests/templates/func_specialized_template_param.cc
index 16aba2d6..42820435 100644
--- a/tests/templates/func_specialized_template_param.cc
+++ b/tests/templates/func_specialized_template_param.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "detailed_name": "Template",
       "definition_spelling": "2:7-2:15",
       "definition_extent": "2:1-2:18",
-      "uses": ["*2:7-2:15", "5:12-5:20", "*8:15-8:23"]
+      "uses": ["2:7-2:15", "5:12-5:20", "8:15-8:23"]
     }, {
       "id": 1,
       "usr": "c:@S@Foo",
@@ -26,7 +26,7 @@ OUTPUT:
       "definition_spelling": "4:8-4:11",
       "definition_extent": "4:1-6:2",
       "funcs": [0],
-      "uses": ["*4:8-4:11", "8:6-8:9"]
+      "uses": ["4:8-4:11", "8:6-8:9"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/templates/implicit_variable_instantiation.cc b/tests/templates/implicit_variable_instantiation.cc
index 2ab52cd8..0bb93770 100644
--- a/tests/templates/implicit_variable_instantiation.cc
+++ b/tests/templates/implicit_variable_instantiation.cc
@@ -25,7 +25,7 @@ OUTPUT:
       "definition_spelling": "2:8-2:15",
       "definition_extent": "2:3-2:18",
       "instantiations": [0],
-      "uses": ["*2:8-2:15", "*6:22-6:29", "*6:44-6:51", "*10:18-10:25"]
+      "uses": ["2:8-2:15", "6:22-6:29", "6:44-6:51", "10:18-10:25"]
     }, {
       "id": 1,
       "usr": "c:@N@ns@ST>1#T@Holder",
@@ -34,7 +34,7 @@ OUTPUT:
       "definition_spelling": "5:10-5:16",
       "definition_extent": "5:3-7:4",
       "vars": [0],
-      "uses": ["*5:10-5:16", "*10:26-10:32", "13:13-13:19", "14:14-14:20"]
+      "uses": ["5:10-5:16", "10:26-10:32", "13:13-13:19", "14:14-14:20"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc b/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc
index 338b1160..50fdea22 100644
--- a/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc
+++ b/tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc
@@ -22,7 +22,7 @@ OUTPUT:
       "definition_spelling": "3:10-3:13",
       "definition_extent": "3:3-8:4",
       "funcs": [0],
-      "uses": ["*3:10-3:13", "10:11-10:14", "11:11-11:14"]
+      "uses": ["3:10-3:13", "10:11-10:14", "11:11-11:14"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/templates/namespace_template_type_usage_folded_into_one.cc b/tests/templates/namespace_template_type_usage_folded_into_one.cc
index db9ccf73..eca842f9 100644
--- a/tests/templates/namespace_template_type_usage_folded_into_one.cc
+++ b/tests/templates/namespace_template_type_usage_folded_into_one.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "definition_spelling": "3:9-3:12",
       "definition_extent": "3:3-3:15",
       "instantiations": [0, 1],
-      "uses": ["*3:9-3:12", "*5:3-5:6", "*6:3-6:6"]
+      "uses": ["3:9-3:12", "5:3-5:6", "6:3-6:6"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/templates/specialized_func_definition.cc b/tests/templates/specialized_func_definition.cc
index db5d3a0f..33b34419 100644
--- a/tests/templates/specialized_func_definition.cc
+++ b/tests/templates/specialized_func_definition.cc
@@ -23,7 +23,7 @@ OUTPUT:
       "definition_spelling": "2:7-2:15",
       "definition_extent": "2:1-4:2",
       "funcs": [0],
-      "uses": ["*2:7-2:15", "*7:6-7:14", "9:6-9:14"]
+      "uses": ["2:7-2:15", "7:6-7:14", "9:6-9:14"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/templates/template_class_func_usage_folded_into_one.cc b/tests/templates/template_class_func_usage_folded_into_one.cc
index d5dbaff2..423c421d 100644
--- a/tests/templates/template_class_func_usage_folded_into_one.cc
+++ b/tests/templates/template_class_func_usage_folded_into_one.cc
@@ -19,7 +19,7 @@ OUTPUT:
       "definition_spelling": "2:8-2:11",
       "definition_extent": "2:1-6:2",
       "funcs": [0],
-      "uses": ["*2:8-2:11", "8:9-8:12", "9:9-9:12"]
+      "uses": ["2:8-2:11", "8:9-8:12", "9:9-9:12"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/templates/template_class_template_func_usage_folded_into_one.cc b/tests/templates/template_class_template_func_usage_folded_into_one.cc
index 7aa66ef8..efea301a 100644
--- a/tests/templates/template_class_template_func_usage_folded_into_one.cc
+++ b/tests/templates/template_class_template_func_usage_folded_into_one.cc
@@ -20,7 +20,7 @@ OUTPUT:
       "definition_spelling": "2:8-2:11",
       "definition_extent": "2:1-7:2",
       "funcs": [0],
-      "uses": ["*2:8-2:11", "9:9-9:12", "10:9-10:12"]
+      "uses": ["2:8-2:11", "9:9-9:12", "10:9-10:12"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/templates/template_class_type_usage_folded_into_one.cc b/tests/templates/template_class_type_usage_folded_into_one.cc
index 8aeb4a34..52c61e58 100644
--- a/tests/templates/template_class_type_usage_folded_into_one.cc
+++ b/tests/templates/template_class_type_usage_folded_into_one.cc
@@ -37,7 +37,7 @@ OUTPUT:
       "detailed_name": "A",
       "definition_spelling": "1:6-1:7",
       "definition_extent": "1:1-1:10",
-      "uses": ["*1:6-1:7", "*9:5-9:6"]
+      "uses": ["1:6-1:7", "9:5-9:6"]
     }, {
       "id": 1,
       "usr": "c:@E@B",
@@ -45,7 +45,7 @@ OUTPUT:
       "detailed_name": "B",
       "definition_spelling": "2:6-2:7",
       "definition_extent": "2:1-2:10",
-      "uses": ["*2:6-2:7", "*10:5-10:6"]
+      "uses": ["2:6-2:7", "10:5-10:6"]
     }, {
       "id": 2,
       "usr": "c:@ST>1#T@Foo",
@@ -53,7 +53,7 @@ OUTPUT:
       "detailed_name": "Foo",
       "definition_spelling": "5:8-5:11",
       "definition_extent": "5:1-7:2",
-      "uses": ["*5:8-5:11", "*9:1-9:4", "*10:1-10:4"]
+      "uses": ["5:8-5:11", "9:1-9:4", "10:1-10:4"]
     }, {
       "id": 3,
       "usr": "c:@ST>1#T@Foo@S@Inner",
@@ -62,7 +62,7 @@ OUTPUT:
       "definition_spelling": "6:10-6:15",
       "definition_extent": "6:3-6:18",
       "instantiations": [0, 1],
-      "uses": ["*6:10-6:15", "*9:9-9:14", "*10:9-10:14"]
+      "uses": ["6:10-6:15", "9:9-9:14", "10:9-10:14"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/templates/template_class_var_usage_folded_into_one.cc b/tests/templates/template_class_var_usage_folded_into_one.cc
index 78ee504f..ae224965 100644
--- a/tests/templates/template_class_var_usage_folded_into_one.cc
+++ b/tests/templates/template_class_var_usage_folded_into_one.cc
@@ -16,7 +16,7 @@ OUTPUT:
       "detailed_name": "Foo",
       "definition_spelling": "2:8-2:11",
       "definition_extent": "2:1-4:2",
-      "uses": ["*2:8-2:11", "6:9-6:12", "7:9-7:12"]
+      "uses": ["2:8-2:11", "6:9-6:12", "7:9-7:12"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/templates/template_type_usage_folded_into_one.cc b/tests/templates/template_type_usage_folded_into_one.cc
index 1a5b14d9..1acc2653 100644
--- a/tests/templates/template_type_usage_folded_into_one.cc
+++ b/tests/templates/template_type_usage_folded_into_one.cc
@@ -15,7 +15,7 @@ OUTPUT:
       "definition_spelling": "2:7-2:10",
       "definition_extent": "2:1-2:13",
       "instantiations": [0, 1],
-      "uses": ["*2:7-2:10", "*4:1-4:4", "*5:1-5:4"]
+      "uses": ["2:7-2:10", "4:1-4:4", "5:1-5:4"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/templates/template_var_usage_folded_into_one.cc b/tests/templates/template_var_usage_folded_into_one.cc
index f12d7b10..a55aa064 100644
--- a/tests/templates/template_var_usage_folded_into_one.cc
+++ b/tests/templates/template_var_usage_folded_into_one.cc
@@ -37,7 +37,7 @@ OUTPUT:
       "detailed_name": "A",
       "definition_spelling": "1:6-1:7",
       "definition_extent": "1:1-1:10",
-      "uses": ["*1:6-1:7", "7:13-7:14"]
+      "uses": ["1:6-1:7", "7:13-7:14"]
     }, {
       "id": 1,
       "usr": "c:@E@B",
@@ -45,11 +45,11 @@ OUTPUT:
       "detailed_name": "B",
       "definition_spelling": "2:6-2:7",
       "definition_extent": "2:1-2:10",
-      "uses": ["*2:6-2:7", "8:13-8:14"]
+      "uses": ["2:6-2:7", "8:13-8:14"]
     }, {
       "id": 2,
       "usr": "c:template_var_usage_folded_into_one.cc@35",
-      "uses": ["*5:1-5:2"]
+      "uses": ["5:1-5:2"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/types/anonymous_struct.cc b/tests/types/anonymous_struct.cc
index 5b3a842e..b1091372 100644
--- a/tests/types/anonymous_struct.cc
+++ b/tests/types/anonymous_struct.cc
@@ -14,7 +14,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:14",
       "definition_extent": "1:1-4:2",
       "vars": [3],
-      "uses": ["*1:7-1:14"]
+      "uses": ["1:7-1:14"]
     }, {
       "id": 1,
       "usr": "c:@U@vector3@Sa",
@@ -23,7 +23,7 @@ OUTPUT:
       "definition_spelling": "2:3-2:9",
       "definition_extent": "2:3-2:28",
       "vars": [0, 1, 2],
-      "uses": ["*2:3-2:9"]
+      "uses": ["2:3-2:9"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/unions/union_decl.cc b/tests/unions/union_decl.cc
index c549f978..f72c3bcd 100644
--- a/tests/unions/union_decl.cc
+++ b/tests/unions/union_decl.cc
@@ -14,7 +14,7 @@ OUTPUT:
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-4:2",
       "vars": [0, 1],
-      "uses": ["*1:7-1:10"]
+      "uses": ["1:7-1:10"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/unions/union_usage.cc b/tests/unions/union_usage.cc
index f79aa637..68f01317 100644
--- a/tests/unions/union_usage.cc
+++ b/tests/unions/union_usage.cc
@@ -23,7 +23,7 @@ OUTPUT:
       "definition_extent": "1:1-4:2",
       "vars": [0, 1],
       "instantiations": [2],
-      "uses": ["*1:7-1:10", "*6:1-6:4", "*8:10-8:13"]
+      "uses": ["1:7-1:10", "6:1-6:4", "8:10-8:13"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/func_called_from_constructor.cc b/tests/usage/func_called_from_constructor.cc
index e4e26390..4b2aeff3 100644
--- a/tests/usage/func_called_from_constructor.cc
+++ b/tests/usage/func_called_from_constructor.cc
@@ -19,7 +19,7 @@ OUTPUT:
       "definition_spelling": "3:8-3:11",
       "definition_extent": "3:1-5:2",
       "funcs": [1],
-      "uses": ["*3:8-3:11", "4:3-4:6", "7:6-7:9", "7:1-7:4"]
+      "uses": ["3:8-3:11", "4:3-4:6", "7:6-7:9", "7:1-7:4"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/func_called_implicit_ctor.cc b/tests/usage/func_called_implicit_ctor.cc
index 4b3c6d42..1ae098ac 100644
--- a/tests/usage/func_called_implicit_ctor.cc
+++ b/tests/usage/func_called_implicit_ctor.cc
@@ -19,7 +19,7 @@ OUTPUT:
       "definition_spelling": "1:8-1:15",
       "definition_extent": "1:1-3:2",
       "funcs": [0],
-      "uses": ["*1:8-1:15", "2:3-2:10", "*7:1-7:8"]
+      "uses": ["1:8-1:15", "2:3-2:10", "7:1-7:8"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/func_usage_addr_method.cc b/tests/usage/func_usage_addr_method.cc
index 08157b87..9ec5b89b 100644
--- a/tests/usage/func_usage_addr_method.cc
+++ b/tests/usage/func_usage_addr_method.cc
@@ -18,7 +18,7 @@ OUTPUT:
       "definition_spelling": "1:8-1:11",
       "definition_extent": "1:1-3:2",
       "funcs": [0],
-      "uses": ["*1:8-1:11", "6:13-6:16"]
+      "uses": ["1:8-1:11", "6:13-6:16"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/func_usage_call_method.cc b/tests/usage/func_usage_call_method.cc
index 10af8e3b..365f68b7 100644
--- a/tests/usage/func_usage_call_method.cc
+++ b/tests/usage/func_usage_call_method.cc
@@ -19,7 +19,7 @@ OUTPUT:
       "definition_extent": "1:1-3:2",
       "funcs": [0],
       "instantiations": [0],
-      "uses": ["*1:8-1:11", "*6:3-6:6"]
+      "uses": ["1:8-1:11", "6:3-6:6"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/func_usage_class_inline_var_def.cc b/tests/usage/func_usage_class_inline_var_def.cc
index cad03e81..460af4b2 100644
--- a/tests/usage/func_usage_class_inline_var_def.cc
+++ b/tests/usage/func_usage_class_inline_var_def.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "definition_spelling": "5:7-5:10",
       "definition_extent": "5:1-7:2",
       "vars": [0],
-      "uses": ["*5:7-5:10"]
+      "uses": ["5:7-5:10"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/func_usage_forward_decl_method.cc b/tests/usage/func_usage_forward_decl_method.cc
index 1213ba7c..e93876ba 100644
--- a/tests/usage/func_usage_forward_decl_method.cc
+++ b/tests/usage/func_usage_forward_decl_method.cc
@@ -18,7 +18,7 @@ OUTPUT:
       "definition_extent": "1:1-3:2",
       "funcs": [0],
       "instantiations": [0],
-      "uses": ["*1:8-1:11", "*6:3-6:6"]
+      "uses": ["1:8-1:11", "6:3-6:6"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/type_usage_as_template_parameter.cc b/tests/usage/type_usage_as_template_parameter.cc
index 9577accd..8dbbb0a0 100644
--- a/tests/usage/type_usage_as_template_parameter.cc
+++ b/tests/usage/type_usage_as_template_parameter.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "id": 0,
       "usr": "c:@ST>1#T@unique_ptr",
       "instantiations": [0, 1, 2],
-      "uses": ["2:7-2:17", "*6:8-6:18", "*7:8-7:18", "*9:1-9:11", "*10:3-10:13"]
+      "uses": ["2:7-2:17", "6:8-6:18", "7:8-7:18", "9:1-9:11", "10:3-10:13"]
     }, {
       "id": 1,
       "usr": "c:@S@S",
@@ -25,7 +25,7 @@ OUTPUT:
       "detailed_name": "S",
       "definition_spelling": "4:8-4:9",
       "definition_extent": "4:1-4:12",
-      "uses": ["*4:8-4:9", "*7:19-7:20", "*9:12-9:13", "*10:14-10:15"]
+      "uses": ["4:8-4:9", "7:19-7:20", "9:12-9:13", "10:14-10:15"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/type_usage_as_template_parameter_complex.cc b/tests/usage/type_usage_as_template_parameter_complex.cc
index 52a5708e..7fc9420b 100644
--- a/tests/usage/type_usage_as_template_parameter_complex.cc
+++ b/tests/usage/type_usage_as_template_parameter_complex.cc
@@ -85,15 +85,15 @@ OUTPUT:
       "id": 0,
       "usr": "c:@ST>2#T#T@unique_ptr",
       "instantiations": [0, 1],
-      "uses": ["2:7-2:17", "*15:8-15:18", "*15:19-15:29", "*33:1-33:11", "*33:12-33:22", "*33:52-33:62", "*54:3-54:13", "*54:14-54:24", "*65:3-65:13", "*79:1-79:11"]
+      "uses": ["2:7-2:17", "15:8-15:18", "15:19-15:29", "33:1-33:11", "33:12-33:22", "33:52-33:62", "54:3-54:13", "54:14-54:24", "65:3-65:13", "79:1-79:11"]
     }, {
       "id": 1,
       "usr": "c:@S@S1",
-      "uses": ["4:8-4:10", "*15:30-15:32", "*33:23-33:25", "*33:63-33:65", "*54:25-54:27", "*65:14-65:16", "*79:12-79:14"]
+      "uses": ["4:8-4:10", "15:30-15:32", "33:23-33:25", "33:63-33:65", "54:25-54:27", "65:14-65:16", "79:12-79:14"]
     }, {
       "id": 2,
       "usr": "c:@S@S2",
-      "uses": ["5:8-5:10", "*15:34-15:36", "*15:39-15:41", "*33:27-33:29", "*33:32-33:34", "*33:67-33:69", "*54:29-54:31", "*54:34-54:36", "*65:18-65:20", "*79:16-79:18"]
+      "uses": ["5:8-5:10", "15:34-15:36", "15:39-15:41", "33:27-33:29", "33:32-33:34", "33:67-33:69", "54:29-54:31", "54:34-54:36", "65:18-65:20", "79:16-79:18"]
     }, {
       "id": 3,
       "usr": "c:@S@Foo",
@@ -102,7 +102,7 @@ OUTPUT:
       "definition_spelling": "64:7-64:10",
       "definition_extent": "64:1-66:2",
       "funcs": [3],
-      "uses": ["*64:7-64:10", "79:21-79:24"]
+      "uses": ["64:7-64:10", "79:21-79:24"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/type_usage_as_template_parameter_simple.cc b/tests/usage/type_usage_as_template_parameter_simple.cc
index 3f05462d..18c437f0 100644
--- a/tests/usage/type_usage_as_template_parameter_simple.cc
+++ b/tests/usage/type_usage_as_template_parameter_simple.cc
@@ -16,11 +16,11 @@ OUTPUT:
       "definition_spelling": "2:7-2:17",
       "definition_extent": "2:1-2:20",
       "instantiations": [0],
-      "uses": ["*2:7-2:17", "*6:8-6:18"]
+      "uses": ["2:7-2:17", "6:8-6:18"]
     }, {
       "id": 1,
       "usr": "c:@S@S",
-      "uses": ["4:8-4:9", "*6:19-6:20"]
+      "uses": ["4:8-4:9", "6:19-6:20"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/usage/type_usage_declare_extern.cc b/tests/usage/type_usage_declare_extern.cc
index 4afbbec2..3912024d 100644
--- a/tests/usage/type_usage_declare_extern.cc
+++ b/tests/usage/type_usage_declare_extern.cc
@@ -12,7 +12,7 @@ OUTPUT:
       "definition_spelling": "1:8-1:9",
       "definition_extent": "1:1-1:12",
       "instantiations": [0],
-      "uses": ["*1:8-1:9", "*3:8-3:9"]
+      "uses": ["1:8-1:9", "3:8-3:9"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/usage/type_usage_declare_field.cc b/tests/usage/type_usage_declare_field.cc
index 0041faa2..5711f4b8 100644
--- a/tests/usage/type_usage_declare_field.cc
+++ b/tests/usage/type_usage_declare_field.cc
@@ -13,7 +13,7 @@ OUTPUT:
       "id": 0,
       "usr": "c:@S@ForwardType",
       "instantiations": [0],
-      "uses": ["1:8-1:19", "*5:3-5:14"]
+      "uses": ["1:8-1:19", "5:3-5:14"]
     }, {
       "id": 1,
       "usr": "c:@S@ImplementedType",
@@ -22,7 +22,7 @@ OUTPUT:
       "definition_spelling": "2:8-2:23",
       "definition_extent": "2:1-2:26",
       "instantiations": [1],
-      "uses": ["*2:8-2:23", "*6:3-6:18"]
+      "uses": ["2:8-2:23", "6:3-6:18"]
     }, {
       "id": 2,
       "usr": "c:@S@Foo",
@@ -31,7 +31,7 @@ OUTPUT:
       "definition_spelling": "4:8-4:11",
       "definition_extent": "4:1-7:2",
       "vars": [0, 1],
-      "uses": ["*4:8-4:11"]
+      "uses": ["4:8-4:11"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/usage/type_usage_declare_local.cc b/tests/usage/type_usage_declare_local.cc
index 7b359db0..663df5bf 100644
--- a/tests/usage/type_usage_declare_local.cc
+++ b/tests/usage/type_usage_declare_local.cc
@@ -13,7 +13,7 @@ OUTPUT:
       "id": 0,
       "usr": "c:@S@ForwardType",
       "instantiations": [0],
-      "uses": ["1:8-1:19", "*5:3-5:14"]
+      "uses": ["1:8-1:19", "5:3-5:14"]
     }, {
       "id": 1,
       "usr": "c:@S@ImplementedType",
@@ -22,7 +22,7 @@ OUTPUT:
       "definition_spelling": "2:8-2:23",
       "definition_extent": "2:1-2:26",
       "instantiations": [1],
-      "uses": ["*2:8-2:23", "*6:3-6:18"]
+      "uses": ["2:8-2:23", "6:3-6:18"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/type_usage_declare_param.cc b/tests/usage/type_usage_declare_param.cc
index a163ca0e..36919f0c 100644
--- a/tests/usage/type_usage_declare_param.cc
+++ b/tests/usage/type_usage_declare_param.cc
@@ -10,7 +10,7 @@ OUTPUT:
       "id": 0,
       "usr": "c:@S@ForwardType",
       "instantiations": [0],
-      "uses": ["1:8-1:19", "*4:10-4:21"]
+      "uses": ["1:8-1:19", "4:10-4:21"]
     }, {
       "id": 1,
       "usr": "c:@S@ImplementedType",
@@ -19,7 +19,7 @@ OUTPUT:
       "definition_spelling": "2:8-2:23",
       "definition_extent": "2:1-2:26",
       "instantiations": [1],
-      "uses": ["*2:8-2:23", "*4:26-4:41"]
+      "uses": ["2:8-2:23", "4:26-4:41"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/type_usage_declare_param_prototype.cc b/tests/usage/type_usage_declare_param_prototype.cc
index 53c316e8..3a3d473d 100644
--- a/tests/usage/type_usage_declare_param_prototype.cc
+++ b/tests/usage/type_usage_declare_param_prototype.cc
@@ -15,7 +15,7 @@ OUTPUT:
       "id": 0,
       "usr": "c:@S@Foo",
       "instantiations": [0],
-      "uses": ["1:8-1:11", "3:10-3:13", "3:18-3:21", "*4:10-4:13", "*4:18-4:21"]
+      "uses": ["1:8-1:11", "3:10-3:13", "3:18-3:21", "4:10-4:13", "4:18-4:21"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/type_usage_declare_param_unnamed.cc b/tests/usage/type_usage_declare_param_unnamed.cc
index c084c2a1..26a4cd6c 100644
--- a/tests/usage/type_usage_declare_param_unnamed.cc
+++ b/tests/usage/type_usage_declare_param_unnamed.cc
@@ -6,7 +6,7 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@ForwardType",
-      "uses": ["1:8-1:19", "*2:10-2:21"]
+      "uses": ["1:8-1:19", "2:10-2:21"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/type_usage_declare_qualifiers.cc b/tests/usage/type_usage_declare_qualifiers.cc
index 451f02ff..d1c5eb87 100644
--- a/tests/usage/type_usage_declare_qualifiers.cc
+++ b/tests/usage/type_usage_declare_qualifiers.cc
@@ -17,7 +17,7 @@ OUTPUT:
       "definition_spelling": "1:8-1:12",
       "definition_extent": "1:1-1:15",
       "instantiations": [0, 1, 2, 3, 4, 5],
-      "uses": ["*1:8-1:12", "*3:10-3:14", "*3:26-3:30", "*4:3-4:7", "*5:3-5:7", "*6:9-6:13", "*7:9-7:13"]
+      "uses": ["1:8-1:12", "3:10-3:14", "3:26-3:30", "4:3-4:7", "5:3-5:7", "6:9-6:13", "7:9-7:13"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/type_usage_declare_static.cc b/tests/usage/type_usage_declare_static.cc
index f5102d50..d96e1372 100644
--- a/tests/usage/type_usage_declare_static.cc
+++ b/tests/usage/type_usage_declare_static.cc
@@ -7,7 +7,7 @@ OUTPUT:
       "id": 0,
       "usr": "c:@S@Type",
       "instantiations": [0],
-      "uses": ["1:8-1:12", "*2:8-2:12"]
+      "uses": ["1:8-1:12", "2:8-2:12"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/usage/type_usage_on_return_type.cc b/tests/usage/type_usage_on_return_type.cc
index 2aa7c7ff..875ea4f6 100644
--- a/tests/usage/type_usage_on_return_type.cc
+++ b/tests/usage/type_usage_on_return_type.cc
@@ -23,7 +23,7 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@Type",
-      "uses": ["1:8-1:12", "*3:1-3:5", "*4:1-4:5", "*5:1-5:5", "*8:3-8:7", "*12:1-12:5", "*15:14-15:18", "*17:8-17:12", "*18:8-18:12"]
+      "uses": ["1:8-1:12", "3:1-3:5", "4:1-4:5", "5:1-5:5", "8:3-8:7", "12:1-12:5", "15:14-15:18", "17:8-17:12", "18:8-18:12"]
     }, {
       "id": 1,
       "usr": "c:@S@Foo",
@@ -32,7 +32,7 @@ OUTPUT:
       "definition_spelling": "7:7-7:10",
       "definition_extent": "7:1-10:2",
       "funcs": [1, 2],
-      "uses": ["*7:7-7:10", "12:7-12:10", "13:6-13:9"]
+      "uses": ["7:7-7:10", "12:7-12:10", "13:6-13:9"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/type_usage_typedef_and_using.cc b/tests/usage/type_usage_typedef_and_using.cc
index da6f1c40..3974157f 100644
--- a/tests/usage/type_usage_typedef_and_using.cc
+++ b/tests/usage/type_usage_typedef_and_using.cc
@@ -15,7 +15,7 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@S@Foo",
-      "uses": ["1:8-1:11", "*2:14-2:17", "*3:9-3:12", "*7:13-7:16"]
+      "uses": ["1:8-1:11", "2:14-2:17", "3:9-3:12", "7:13-7:16"]
     }, {
       "id": 1,
       "usr": "c:@Foo1",
@@ -24,7 +24,7 @@ OUTPUT:
       "definition_spelling": "2:7-2:11",
       "definition_extent": "2:1-2:18",
       "alias_of": 0,
-      "uses": ["*2:7-2:11", "*4:14-4:18", "*8:14-8:18"]
+      "uses": ["2:7-2:11", "4:14-4:18", "8:14-8:18"]
     }, {
       "id": 2,
       "usr": "c:type_usage_typedef_and_using.cc@T@Foo2",
@@ -33,7 +33,7 @@ OUTPUT:
       "definition_spelling": "3:13-3:17",
       "definition_extent": "3:1-3:17",
       "alias_of": 0,
-      "uses": ["*3:13-3:17", "*9:14-9:18"]
+      "uses": ["3:13-3:17", "9:14-9:18"]
     }, {
       "id": 3,
       "usr": "c:@Foo3",
@@ -42,7 +42,7 @@ OUTPUT:
       "definition_spelling": "4:7-4:11",
       "definition_extent": "4:1-4:18",
       "alias_of": 1,
-      "uses": ["*4:7-4:11", "*10:14-10:18"]
+      "uses": ["4:7-4:11", "10:14-10:18"]
     }, {
       "id": 4,
       "usr": "c:@Foo4",
@@ -50,7 +50,7 @@ OUTPUT:
       "detailed_name": "Foo4",
       "definition_spelling": "5:7-5:11",
       "definition_extent": "5:1-5:17",
-      "uses": ["*5:7-5:11"]
+      "uses": ["5:7-5:11"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/type_usage_typedef_and_using_template.cc b/tests/usage/type_usage_typedef_and_using_template.cc
index f64c4a9d..29614e1c 100644
--- a/tests/usage/type_usage_typedef_and_using_template.cc
+++ b/tests/usage/type_usage_typedef_and_using_template.cc
@@ -10,7 +10,7 @@ OUTPUT:
   "types": [{
       "id": 0,
       "usr": "c:@ST>1#T@Foo",
-      "uses": ["2:8-2:11", "*4:14-4:17", "*5:9-5:12"]
+      "uses": ["2:8-2:11", "4:14-4:17", "5:9-5:12"]
     }, {
       "id": 1,
       "usr": "c:@Foo1",
@@ -19,7 +19,7 @@ OUTPUT:
       "definition_spelling": "4:7-4:11",
       "definition_extent": "4:1-4:22",
       "alias_of": 0,
-      "uses": ["*4:7-4:11", "*5:13-5:17"]
+      "uses": ["4:7-4:11", "5:13-5:17"]
     }, {
       "id": 2,
       "usr": "c:type_usage_typedef_and_using_template.cc@T@Foo2",
@@ -28,7 +28,7 @@ OUTPUT:
       "definition_spelling": "5:19-5:23",
       "definition_extent": "5:1-5:23",
       "alias_of": 0,
-      "uses": ["*5:19-5:23"]
+      "uses": ["5:19-5:23"]
     }]
 }
 */
diff --git a/tests/usage/type_usage_various.cc b/tests/usage/type_usage_various.cc
index 08e19151..f2c52f80 100644
--- a/tests/usage/type_usage_various.cc
+++ b/tests/usage/type_usage_various.cc
@@ -21,7 +21,7 @@ OUTPUT:
       "definition_extent": "1:1-3:2",
       "funcs": [0],
       "instantiations": [0, 1],
-      "uses": ["*1:7-1:10", "*2:3-2:6", "*5:1-5:4", "5:6-5:9", "*6:3-6:6", "*10:8-10:11"]
+      "uses": ["1:7-1:10", "2:3-2:6", "5:1-5:4", "5:6-5:9", "6:3-6:6", "10:8-10:11"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/usage_inside_of_call.cc b/tests/usage/usage_inside_of_call.cc
index be010886..3feb1714 100644
--- a/tests/usage/usage_inside_of_call.cc
+++ b/tests/usage/usage_inside_of_call.cc
@@ -25,7 +25,7 @@ OUTPUT:
       "definition_spelling": "5:8-5:11",
       "definition_extent": "5:1-8:2",
       "vars": [1, 0],
-      "uses": ["*5:8-5:11", "10:5-10:8", "14:22-14:25", "14:40-14:43"]
+      "uses": ["5:8-5:11", "10:5-10:8", "14:22-14:25", "14:40-14:43"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/var_usage_class_member.cc b/tests/usage/var_usage_class_member.cc
index c98db108..665f5b9b 100644
--- a/tests/usage/var_usage_class_member.cc
+++ b/tests/usage/var_usage_class_member.cc
@@ -29,7 +29,7 @@ OUTPUT:
       "definition_extent": "1:1-5:2",
       "vars": [0, 1],
       "instantiations": [2],
-      "uses": ["*1:7-1:10", "*11:3-11:6"]
+      "uses": ["1:7-1:10", "11:3-11:6"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/var_usage_class_member_static.cc b/tests/usage/var_usage_class_member_static.cc
index bd1edc2b..b0f35acd 100644
--- a/tests/usage/var_usage_class_member_static.cc
+++ b/tests/usage/var_usage_class_member_static.cc
@@ -18,7 +18,7 @@ OUTPUT:
       "detailed_name": "Foo",
       "definition_spelling": "1:8-1:11",
       "definition_extent": "1:1-3:2",
-      "uses": ["*1:8-1:11", "8:10-8:13"]
+      "uses": ["1:8-1:11", "8:10-8:13"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/usage/var_usage_cstyle_cast.cc b/tests/usage/var_usage_cstyle_cast.cc
index 281daea5..02db8dfc 100644
--- a/tests/usage/var_usage_cstyle_cast.cc
+++ b/tests/usage/var_usage_cstyle_cast.cc
@@ -18,7 +18,7 @@ OUTPUT:
       "definition_spelling": "1:6-1:13",
       "definition_extent": "1:1-1:16",
       "instantiations": [0],
-      "uses": ["*1:6-1:13", "*4:20-4:27", "*4:42-4:49", "*7:7-7:14"]
+      "uses": ["1:6-1:13", "4:20-4:27", "4:42-4:49", "7:7-7:14"]
     }, {
       "id": 1,
       "usr": "c:@S@Holder",
@@ -27,7 +27,7 @@ OUTPUT:
       "definition_spelling": "3:8-3:14",
       "definition_extent": "3:1-5:2",
       "vars": [0],
-      "uses": ["*3:8-3:14", "7:15-7:21"]
+      "uses": ["3:8-3:14", "7:15-7:21"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/vars/class_member.cc b/tests/vars/class_member.cc
index 0cb7b587..e04b7899 100644
--- a/tests/vars/class_member.cc
+++ b/tests/vars/class_member.cc
@@ -13,7 +13,7 @@ OUTPUT:
       "definition_extent": "1:1-3:2",
       "vars": [0],
       "instantiations": [0],
-      "uses": ["*1:7-1:10", "*2:3-2:6"]
+      "uses": ["1:7-1:10", "2:3-2:6"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/vars/class_static_member.cc b/tests/vars/class_static_member.cc
index 6a927a06..a0e724d7 100644
--- a/tests/vars/class_static_member.cc
+++ b/tests/vars/class_static_member.cc
@@ -15,7 +15,7 @@ OUTPUT:
       "definition_extent": "1:1-3:2",
       "vars": [0],
       "instantiations": [0],
-      "uses": ["*1:7-1:10", "*2:10-2:13", "*4:1-4:4", "4:6-4:9"]
+      "uses": ["1:7-1:10", "2:10-2:13", "4:1-4:4", "4:6-4:9"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/vars/class_static_member_decl_only.cc b/tests/vars/class_static_member_decl_only.cc
index b0856257..e2dc728c 100644
--- a/tests/vars/class_static_member_decl_only.cc
+++ b/tests/vars/class_static_member_decl_only.cc
@@ -11,7 +11,7 @@ OUTPUT:
       "detailed_name": "Foo",
       "definition_spelling": "1:7-1:10",
       "definition_extent": "1:1-3:2",
-      "uses": ["*1:7-1:10"]
+      "uses": ["1:7-1:10"]
     }],
   "vars": [{
       "id": 0,
diff --git a/tests/vars/function_local.cc b/tests/vars/function_local.cc
index 75c24b48..ed8e1f6e 100644
--- a/tests/vars/function_local.cc
+++ b/tests/vars/function_local.cc
@@ -11,7 +11,7 @@ OUTPUT:
       "id": 0,
       "usr": "c:@S@Foo",
       "instantiations": [0],
-      "uses": ["1:8-1:11", "*4:3-4:6"]
+      "uses": ["1:8-1:11", "4:3-4:6"]
     }],
   "funcs": [{
       "id": 0,
diff --git a/tests/vars/function_param.cc b/tests/vars/function_param.cc
index 91c6edd3..4d2caa23 100644
--- a/tests/vars/function_param.cc
+++ b/tests/vars/function_param.cc
@@ -9,7 +9,7 @@ OUTPUT:
       "id": 0,
       "usr": "c:@S@Foo",
       "instantiations": [0, 1],
-      "uses": ["1:8-1:11", "*3:10-3:13", "*3:19-3:22"]
+      "uses": ["1:8-1:11", "3:10-3:13", "3:19-3:22"]
     }],
   "funcs": [{
       "id": 0,