diff --git a/regression/goto-diff/java-add-package/test.desc b/regression/goto-diff/java-add-package/test.desc
index c071e7d6f7f..84d88004486 100644
--- a/regression/goto-diff/java-add-package/test.desc
+++ b/regression/goto-diff/java-add-package/test.desc
@@ -5,8 +5,8 @@ old.jar --json-ui
 activate-multi-line-match
 EXIT=0
 SIGNAL=0
-  "deletedFunctions": \[\n    {\n      "name": "java::Test\.<init>:\(\)V",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.<init>:\(\)\V",\n        "line": "1"\n      }\n    },\n    {\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "4"\n      }\n    },\n    {\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test.bar:\(I\)I",\n        "line": "12"\n      }\n    }\n  \],\n
+  "deletedFunctions": \[\n    \{\n      "name": "java::Test\.<init>:\(\)V",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.<init>:\(\)\V",\n        "line": "1"\n      \}\n    \},\n    \{\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "4"\n      \}\n    \},\n    \{\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test.bar:\(I\)I",\n        "line": "12"\n      \}\n    \}\n  \],\n
   "modifiedFunctions": \[ \],
-  "newFunctions": \[\n    {\n      "name": "java::foo\.Test\.<init>:\(\)V",\n      "sourceLocation": {\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.<init>:\(\)V",\n        "line": "3"\n      }\n    },\n    {\n      "name": "java::foo\.Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.foo:\(I\)I",\n        "line": "5"\n      }\n    },\n    {\n      "name": "java::foo\.Test\.bar:\(I\)I",\n      "sourceLocation": {\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.bar:\(I\)I",\n        "line": "14"\n      }\n    }\n  \],
+  "newFunctions": \[\n    \{\n      "name": "java::foo\.Test\.<init>:\(\)V",\n      "sourceLocation": \{\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.<init>:\(\)V",\n        "line": "3"\n      \}\n    \},\n    \{\n      "name": "java::foo\.Test\.foo:\(I\)I",\n      "sourceLocation": \{\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.foo:\(I\)I",\n        "line": "5"\n      \}\n    \},\n    \{\n      "name": "java::foo\.Test\.bar:\(I\)I",\n      "sourceLocation": \{\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.bar:\(I\)I",\n        "line": "14"\n      \}\n    \}\n  \],
 --
 ^warning: ignoring
diff --git a/regression/goto-diff/java-del-package/test.desc b/regression/goto-diff/java-del-package/test.desc
index 58e64919d9e..7ef3b6f631b 100644
--- a/regression/goto-diff/java-del-package/test.desc
+++ b/regression/goto-diff/java-del-package/test.desc
@@ -5,8 +5,8 @@ old.jar --json-ui
 activate-multi-line-match
 EXIT=0
 SIGNAL=0
-  "deletedFunctions": \[\n    {\n      "name": "java::foo\.Test\.<init>:\(\)V",\n      "sourceLocation": {\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.<init>:\(\)V",\n        "line": "3"\n      }\n    },\n    {\n      "name": "java::foo\.Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.foo:\(I\)I",\n        "line": "5"\n      }\n    },\n    {\n      "name": "java::foo\.Test\.bar:\(I\)I",\n      "sourceLocation": {\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.bar:\(I\)I",\n        "line": "14"\n      }\n    }\n  \],
+  "deletedFunctions": \[\n    \{\n      "name": "java::foo\.Test\.<init>:\(\)V",\n      "sourceLocation": \{\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.<init>:\(\)V",\n        "line": "3"\n      \}\n    \},\n    \{\n      "name": "java::foo\.Test\.foo:\(I\)I",\n      "sourceLocation": \{\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.foo:\(I\)I",\n        "line": "5"\n      \}\n    \},\n    \{\n      "name": "java::foo\.Test\.bar:\(I\)I",\n      "sourceLocation": \{\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.bar:\(I\)I",\n        "line": "14"\n      \}\n    \}\n  \],
   "modifiedFunctions": \[ \],
-  "newFunctions": \[\n    {\n      "name": "java::Test\.<init>:\(\)V",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.<init>:\(\)\V",\n        "line": "1"\n      }\n    },\n    {\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "4"\n      }\n    },\n    {\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test.bar:\(I\)I",\n        "line": "12"\n      }\n    }\n  \],\n
+  "newFunctions": \[\n    \{\n      "name": "java::Test\.<init>:\(\)V",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.<init>:\(\)\V",\n        "line": "1"\n      \}\n    \},\n    \{\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "4"\n      \}\n    \},\n    \{\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test.bar:\(I\)I",\n        "line": "12"\n      \}\n    \}\n  \],\n
 --
 ^warning: ignoring
diff --git a/regression/goto-diff/java-deleted-function/test.desc b/regression/goto-diff/java-deleted-function/test.desc
index d60285d0bd4..d68520e8038 100644
--- a/regression/goto-diff/java-deleted-function/test.desc
+++ b/regression/goto-diff/java-deleted-function/test.desc
@@ -5,7 +5,7 @@ old.jar --json-ui
 activate-multi-line-match
 EXIT=0
 SIGNAL=0
-  "deletedFunctions": \[\n    {\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "4"\n      }\n    }\n  \],
+  "deletedFunctions": \[\n    \{\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "4"\n      \}\n    \}\n  \],
   "modifiedFunctions": \[ \],
   "newFunctions": \[ \],
 --
diff --git a/regression/goto-diff/java-mod-identifier2/test.desc b/regression/goto-diff/java-mod-identifier2/test.desc
index 7a5fdf9e9cb..30ca04ea85b 100644
--- a/regression/goto-diff/java-mod-identifier2/test.desc
+++ b/regression/goto-diff/java-mod-identifier2/test.desc
@@ -6,7 +6,7 @@ activate-multi-line-match
 EXIT=0
 SIGNAL=0
   "deletedFunctions": \[ \],
-  "modifiedFunctions": \[\n    {\n      "name": "java::Test\.foo:\(II\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(II\)I",\n        "line": "4"\n      }\n    }\n  \],\n
+  "modifiedFunctions": \[\n    \{\n      "name": "java::Test\.foo:\(II\)I",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(II\)I",\n        "line": "4"\n      \}\n    \}\n  \],\n
   "newFunctions": \[ \],
 --
 ^warning: ignoring
diff --git a/regression/goto-diff/java-mod-package/test.desc b/regression/goto-diff/java-mod-package/test.desc
index 134f6482d2c..f05162a49f1 100644
--- a/regression/goto-diff/java-mod-package/test.desc
+++ b/regression/goto-diff/java-mod-package/test.desc
@@ -5,8 +5,8 @@ old.jar --json-ui
 activate-multi-line-match
 EXIT=0
 SIGNAL=0
-  "deletedFunctions": \[\n    {\n      "name": "java::foo\.Test\.<init>:\(\)V",\n      "sourceLocation": {\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.<init>:\(\)V",\n        "line": "3"\n      }\n    },\n    {\n      "name": "java::foo\.Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.foo:\(I\)I",\n        "line": "5"\n      }\n    },\n    {\n      "name": "java::foo\.Test\.bar:\(I\)I",\n      "sourceLocation": {\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.bar:\(I\)I",\n        "line": "14"\n      }\n    }\n  \],
+  "deletedFunctions": \[\n    \{\n      "name": "java::foo\.Test\.<init>:\(\)V",\n      "sourceLocation": \{\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.<init>:\(\)V",\n        "line": "3"\n      \}\n    \},\n    \{\n      "name": "java::foo\.Test\.foo:\(I\)I",\n      "sourceLocation": \{\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.foo:\(I\)I",\n        "line": "5"\n      \}\n    \},\n    \{\n      "name": "java::foo\.Test\.bar:\(I\)I",\n      "sourceLocation": \{\n        "file": "foo/Test\.java",\n        "function": "java::foo\.Test\.bar:\(I\)I",\n        "line": "14"\n      \}\n    \}\n  \],
   "modifiedFunctions": \[ \],
-  "newFunctions": \[\n    {\n      "name": "java::com\.diffblue\.foo\.Test\.<init>:\(\)V",\n      "sourceLocation": {\n        "file": "com/diffblue/foo/Test\.java",\n        "function": "java::com\.diffblue\.foo\.Test\.<init>:\(\)\V",\n        "line": "3"\n      }\n    },\n    {\n      "name": "java::com\.diffblue\.foo\.Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "com/diffblue/foo/Test\.java",\n        "function": "java::com\.diffblue\.foo\.Test\.foo:\(I\)I",\n        "line": "6"\n      }\n    },\n    {\n      "name": "java::com\.diffblue\.foo\.Test\.bar:\(I\)I",\n      "sourceLocation": {\n        "file": "com/diffblue/foo/Test\.java",\n        "function": "java::com\.diffblue\.foo\.Test.bar:\(I\)I",\n        "line": "14"\n      }\n    }\n  \],\n
+  "newFunctions": \[\n    \{\n      "name": "java::com\.diffblue\.foo\.Test\.<init>:\(\)V",\n      "sourceLocation": \{\n        "file": "com/diffblue/foo/Test\.java",\n        "function": "java::com\.diffblue\.foo\.Test\.<init>:\(\)\V",\n        "line": "3"\n      \}\n    \},\n    \{\n      "name": "java::com\.diffblue\.foo\.Test\.foo:\(I\)I",\n      "sourceLocation": \{\n        "file": "com/diffblue/foo/Test\.java",\n        "function": "java::com\.diffblue\.foo\.Test\.foo:\(I\)I",\n        "line": "6"\n      \}\n    \},\n    \{\n      "name": "java::com\.diffblue\.foo\.Test\.bar:\(I\)I",\n      "sourceLocation": \{\n        "file": "com/diffblue/foo/Test\.java",\n        "function": "java::com\.diffblue\.foo\.Test.bar:\(I\)I",\n        "line": "14"\n      \}\n    \}\n  \],\n
 --
 ^warning: ignoring
diff --git a/regression/goto-diff/java-new-function/test.desc b/regression/goto-diff/java-new-function/test.desc
index ac2fc73a3f6..fd7e52f4fa2 100644
--- a/regression/goto-diff/java-new-function/test.desc
+++ b/regression/goto-diff/java-new-function/test.desc
@@ -7,6 +7,6 @@ EXIT=0
 SIGNAL=0
   "deletedFunctions": \[ \],
   "modifiedFunctions": \[ \],
-  "newFunctions": \[\n    {\n      "name": "java::Test\.foo:\(II\)I",\n      "sourceLocation": {\n        "file": "Test.java",\n        "function": "java::Test\.foo:\(II\)I",\n        "line": "4"\n      }\n    }\n  \],
+  "newFunctions": \[\n    \{\n      "name": "java::Test\.foo:\(II\)I",\n      "sourceLocation": \{\n        "file": "Test.java",\n        "function": "java::Test\.foo:\(II\)I",\n        "line": "4"\n      \}\n    \}\n  \],
 --
 ^warning: ignoring
diff --git a/regression/goto-diff/java-scope-change/test.desc b/regression/goto-diff/java-scope-change/test.desc
index cfe9d962b83..70e43809dd8 100644
--- a/regression/goto-diff/java-scope-change/test.desc
+++ b/regression/goto-diff/java-scope-change/test.desc
@@ -5,7 +5,7 @@ old.jar --json-ui
 activate-multi-line-match
 EXIT=0
 SIGNAL=0
-  "deletedFunctions": \[ \],\n  "modifiedFunctions": \[\n    {\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "4"\n      }\n    },\n    {\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.bar:\(I\)I",\n        "line": "12"\n      }\n    }\n  \],\n  "newFunctions": \[ \],
+  "deletedFunctions": \[ \],\n  "modifiedFunctions": \[\n    \{\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "4"\n      \}\n    \},\n    \{\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.bar:\(I\)I",\n        "line": "12"\n      \}\n    \}\n  \],\n  "newFunctions": \[ \],
 --
 ^warning: ignoring
 --
diff --git a/regression/goto-diff/java-scope-change2/test.desc b/regression/goto-diff/java-scope-change2/test.desc
index cc58141505e..54c1fcd201e 100644
--- a/regression/goto-diff/java-scope-change2/test.desc
+++ b/regression/goto-diff/java-scope-change2/test.desc
@@ -5,7 +5,7 @@ old.jar --json-ui
 activate-multi-line-match
 EXIT=0
 SIGNAL=0
-  "deletedFunctions": \[ \],\n  "modifiedFunctions": \[\n    {\n      "name": "java::Test\.<init>:\(\)V",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.<init>:\(\)V",\n        "line": "1"\n      }\n    },\n    {\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "6"\n      }\n    },\n    {\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.bar:\(I\)I",\n        "line": "14"\n      }\n    }\n  \],\n  "newFunctions": \[ \],
+  "deletedFunctions": \[ \],\n  "modifiedFunctions": \[\n    \{\n      "name": "java::Test\.<init>:\(\)V",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.<init>:\(\)V",\n        "line": "1"\n      \}\n    \},\n    \{\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "6"\n      \}\n    \},\n    \{\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.bar:\(I\)I",\n        "line": "14"\n      \}\n    \}\n  \],\n  "newFunctions": \[ \],
 --
 ^warning: ignoring
 --
diff --git a/regression/goto-diff/java-scope-change3/test.desc b/regression/goto-diff/java-scope-change3/test.desc
index cc58141505e..54c1fcd201e 100644
--- a/regression/goto-diff/java-scope-change3/test.desc
+++ b/regression/goto-diff/java-scope-change3/test.desc
@@ -5,7 +5,7 @@ old.jar --json-ui
 activate-multi-line-match
 EXIT=0
 SIGNAL=0
-  "deletedFunctions": \[ \],\n  "modifiedFunctions": \[\n    {\n      "name": "java::Test\.<init>:\(\)V",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.<init>:\(\)V",\n        "line": "1"\n      }\n    },\n    {\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "6"\n      }\n    },\n    {\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": {\n        "file": "Test\.java",\n        "function": "java::Test\.bar:\(I\)I",\n        "line": "14"\n      }\n    }\n  \],\n  "newFunctions": \[ \],
+  "deletedFunctions": \[ \],\n  "modifiedFunctions": \[\n    \{\n      "name": "java::Test\.<init>:\(\)V",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.<init>:\(\)V",\n        "line": "1"\n      \}\n    \},\n    \{\n      "name": "java::Test\.foo:\(I\)I",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.foo:\(I\)I",\n        "line": "6"\n      \}\n    \},\n    \{\n      "name": "java::Test\.bar:\(I\)I",\n      "sourceLocation": \{\n        "file": "Test\.java",\n        "function": "java::Test\.bar:\(I\)I",\n        "line": "14"\n      \}\n    \}\n  \],\n  "newFunctions": \[ \],
 --
 ^warning: ignoring
 --