diff --git a/.gitmodules b/.gitmodules
index d0cf67907..10520323d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "test/corpus/repos/javascript"]
 	path = test/corpus/repos/javascript
 	url = https://github.com/rewinfrey/javascript
+[submodule "vendor/hspec-expectations-pretty-diff"]
+	path = vendor/hspec-expectations-pretty-diff
+	url = https://github.com/rewinfrey/hspec-expectations-pretty-diff
diff --git a/src/DiffSummary.hs b/src/DiffSummary.hs
index aa531b7b4..50dde1d28 100644
--- a/src/DiffSummary.hs
+++ b/src/DiffSummary.hs
@@ -151,7 +151,7 @@ toLeafInfos HideInfo = []
 toLeafInfos leaf = pure . flip JSONSummary (sourceSpan leaf) $ case leaf of
   (LeafInfo "number" termName _) -> squotes $ toDoc termName
   (LeafInfo "boolean" termName _) -> squotes $ toDoc termName
-  (LeafInfo "anonymous function" termName _) -> toDoc termName
+  (LeafInfo "anonymous function" termName _) -> toDoc termName <+> "function"
   (LeafInfo cName@"string" termName _) -> toDoc termName <+> toDoc cName
   (LeafInfo cName@"export statement" termName _) -> toDoc termName <+> toDoc cName
   LeafInfo{..} -> squotes (toDoc termName) <+> toDoc categoryName
@@ -160,13 +160,20 @@ toLeafInfos leaf = pure . flip JSONSummary (sourceSpan leaf) $ case leaf of
 -- Returns a text representing a specific term given a source and a term.
 toTermName :: forall leaf fields. (HasCategory leaf, HasField fields Category, HasField fields Range) => Source Char -> SyntaxTerm leaf fields -> Text
 toTermName source term = case unwrap term of
-  S.AnonymousFunction params _ -> "anonymous" <> paramsToArgNames params <> " function"
+  S.AnonymousFunction params _ -> "anonymous" <> paramsToArgNames params
   S.Fixed children -> fromMaybe "branch" $ (toCategoryName . category) . extract <$> head children
   S.Indexed children -> fromMaybe "branch" $ (toCategoryName . category) . extract <$> head children
   Leaf leaf -> toCategoryName leaf
   S.Assignment identifier _ -> toTermName' identifier
   S.Function identifier _ _ -> toTermName' identifier
-  S.FunctionCall i args -> toTermName' i <> "(" <> intercalate ", " (toArgName <$> args) <> ")"
+  S.FunctionCall i args -> case unwrap i of
+    S.AnonymousFunction params _ ->
+      -- Omit a function call's arguments if it's arguments match the underlying
+      -- anonymous function's arguments.
+      if (category . extract <$> args) == (category . extract <$> params)
+      then toTermName' i
+      else "(" <> toTermName' i <> ")" <> paramsToArgNames args
+    _ -> toTermName' i <> paramsToArgNames args
   S.MemberAccess base property -> case (unwrap base, unwrap property) of
     (S.FunctionCall{}, S.FunctionCall{}) -> toTermName' base <> "()." <> toTermName' property <> "()"
     (S.FunctionCall{}, _) -> toTermName' base <> "()." <> toTermName' property
@@ -211,9 +218,9 @@ toTermName source term = case unwrap term of
   S.Commented _ _ -> termNameFromChildren term (toList $ unwrap term)
   S.Module identifier _ -> toTermName' identifier
   S.Import identifier _ -> toTermName' identifier
-  S.Export Nothing expr -> intercalate ", " $ termNameFromSource <$> expr
-  S.Export (Just identifier) [] -> toTermName' identifier
-  S.Export (Just identifier) expr -> (intercalate ", " $ termNameFromSource <$> expr) <> " from " <> toTermName' identifier
+  S.Export Nothing expr -> "{ " <> intercalate ", " (termNameFromSource <$> expr) <> " }"
+  S.Export (Just identifier) [] -> "{ " <> toTermName' identifier <> " }"
+  S.Export (Just identifier) expr -> "{ " <> intercalate ", " (termNameFromSource <$> expr) <> " }" <> " from " <> toTermName' identifier
   where toTermName' = toTermName source
         termNameFromChildren term children = termNameFromRange (unionRangesFrom (range term) (range <$> children))
         termNameFromSource term = termNameFromRange (range term)
diff --git a/test/corpus/diff-summaries/javascript/anonymous-function.json b/test/corpus/diff-summaries/javascript/anonymous-function.json
index 5f9b3c064..ec05fe2a0 100644
--- a/test/corpus/diff-summaries/javascript/anonymous-function.json
+++ b/test/corpus/diff-summaries/javascript/anonymous-function.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "4eda6b0a46046cb99a4544fe3a4a9c23e702eeac",
+    "sha1": "b88e2581bf22fd83ccd9c552fa54a566fae500fa",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0ae1cc9281ef60c31e19985b68713eb40fc2ad2c"
+    "sha2": "a70e54a7ec6ddfb58511b6d894e85767efc719cd"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "0ae1cc9281ef60c31e19985b68713eb40fc2ad2c",
+    "sha1": "a70e54a7ec6ddfb58511b6d894e85767efc719cd",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e13ea092e21306d5e46e6bf1a2a18566873475d2"
+    "sha2": "f609039dc69323598115cbd70fe2399a7b1ae919"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-insert-test",
@@ -195,9 +195,9 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "e13ea092e21306d5e46e6bf1a2a18566873475d2",
+    "sha1": "f609039dc69323598115cbd70fe2399a7b1ae919",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "664b50f840363802e3fc974ae60831dc4e13d5c2"
+    "sha2": "7ae86b7a3e91bc93422aefa8e8db1a8a8da9395d"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-replacement-test",
@@ -319,9 +319,9 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "664b50f840363802e3fc974ae60831dc4e13d5c2",
+    "sha1": "7ae86b7a3e91bc93422aefa8e8db1a8a8da9395d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f0b28a88b5b36ac5eb6770e80f5455c5c2ae3396"
+    "sha2": "29d90784003ab29afa83dad11c884c48f6e78035"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-replacement-test",
@@ -380,9 +380,9 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "f0b28a88b5b36ac5eb6770e80f5455c5c2ae3396",
+    "sha1": "29d90784003ab29afa83dad11c884c48f6e78035",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2e8bd85c462e82c1de6ad1d016dec89b8f6c7a94"
+    "sha2": "a130dc667518ae5e008d480632fbb060526af30a"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-test",
@@ -411,9 +411,9 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "2e8bd85c462e82c1de6ad1d016dec89b8f6c7a94",
+    "sha1": "a130dc667518ae5e008d480632fbb060526af30a",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8730cf111655ff909dd1b3a43b8afb78bc05f7b5"
+    "sha2": "0d527a1c55f59b55c3dc2ab0dc9be447c1ca4d95"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-rest-test",
@@ -442,7 +442,7 @@
     "filePaths": [
         "anonymous-function.js"
     ],
-    "sha1": "8730cf111655ff909dd1b3a43b8afb78bc05f7b5",
+    "sha1": "0d527a1c55f59b55c3dc2ab0dc9be447c1ca4d95",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0a29e7e55f31e31e4f830f33dd8b1a6231165888"
+    "sha2": "87081a602c63b0662cdb772ff49008896f31de42"
 }]
diff --git a/test/corpus/diff-summaries/javascript/anonymous-parameterless-function.json b/test/corpus/diff-summaries/javascript/anonymous-parameterless-function.json
index 3ee3eb6d9..48dc8af62 100644
--- a/test/corpus/diff-summaries/javascript/anonymous-parameterless-function.json
+++ b/test/corpus/diff-summaries/javascript/anonymous-parameterless-function.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "972c476a86993546e4da7dd3f2c488b455ff24db",
+    "sha1": "db20a5e93eec8012463791dd86624180af7f8c02",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3e2289ebea24250dc463db0603223b2ad7233e39"
+    "sha2": "11b32deddc4817f49fc4f9b7563949a137472193"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "3e2289ebea24250dc463db0603223b2ad7233e39",
+    "sha1": "11b32deddc4817f49fc4f9b7563949a137472193",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "281d67dce183a41f664372f47fce3f51b32cdb3a"
+    "sha2": "47a85e4766e6afde962584a334c1c1ad2d4ead3b"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "281d67dce183a41f664372f47fce3f51b32cdb3a",
+    "sha1": "47a85e4766e6afde962584a334c1c1ad2d4ead3b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7c730f2014c719d3a12b578babf30f6c2c56c966"
+    "sha2": "2da1097775e2a8e2df18748d794d1d87f380e77c"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "7c730f2014c719d3a12b578babf30f6c2c56c966",
+    "sha1": "2da1097775e2a8e2df18748d794d1d87f380e77c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2917edeb872ab9a847651f3df4d3fe0707f410a8"
+    "sha2": "271f4a0bd6285a948f7b4f34739c798dc304aea7"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "2917edeb872ab9a847651f3df4d3fe0707f410a8",
+    "sha1": "271f4a0bd6285a948f7b4f34739c798dc304aea7",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1cc8d6469e2bb265ac93a2c5e75c5a692cf37610"
+    "sha2": "12a6dcb7e540def90f99684b89d7afce0d684b3c"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "1cc8d6469e2bb265ac93a2c5e75c5a692cf37610",
+    "sha1": "12a6dcb7e540def90f99684b89d7afce0d684b3c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "844cb44d31f4dfae4a7f6d71c968c1f7ed98a728"
+    "sha2": "f9b95bb70b4ce1db4d1bfa4f46385c5397d434ac"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "anonymous-parameterless-function.js"
     ],
-    "sha1": "844cb44d31f4dfae4a7f6d71c968c1f7ed98a728",
+    "sha1": "f9b95bb70b4ce1db4d1bfa4f46385c5397d434ac",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "99592bbf904b69053a764508c8b7e2113f456e77"
+    "sha2": "75fb34302dfb18e9f5934578c020e613934e123f"
 }]
diff --git a/test/corpus/diff-summaries/javascript/array.json b/test/corpus/diff-summaries/javascript/array.json
index 6032f88c4..119a822fe 100644
--- a/test/corpus/diff-summaries/javascript/array.json
+++ b/test/corpus/diff-summaries/javascript/array.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "bc7b1f8621267ae931d598deec486fc92bccc736",
+    "sha1": "85cd03a4c442ebdd202e4746745bfc3347daaa15",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1f5c0ab465c11956cade7def7f18df96c823d8d4"
+    "sha2": "61a19ee888e07e2dc1a0f5c3993586311759b20c"
 }
 ,{
     "testCaseDescription": "javascript-array-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "1f5c0ab465c11956cade7def7f18df96c823d8d4",
+    "sha1": "61a19ee888e07e2dc1a0f5c3993586311759b20c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9eddf6e3cb0a349128bd8900cdf17e43492227da"
+    "sha2": "574a48f3b5873409c3d6bd58fcbd95f9a88dbcfa"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-insert-test",
@@ -102,9 +102,9 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "9eddf6e3cb0a349128bd8900cdf17e43492227da",
+    "sha1": "574a48f3b5873409c3d6bd58fcbd95f9a88dbcfa",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b13b543138e791710292fdf81def6f8d528e8643"
+    "sha2": "48e555eb68c64b1bfe81dd28869c044b6f05834f"
 }
 ,{
     "testCaseDescription": "javascript-array-replacement-test",
@@ -133,9 +133,9 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "b13b543138e791710292fdf81def6f8d528e8643",
+    "sha1": "48e555eb68c64b1bfe81dd28869c044b6f05834f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4dd191872b1355fdd5afeb5bc36f086b7a7cbd73"
+    "sha2": "83e6565af11bca7a42fe0017524c250bfd41a786"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-replacement-test",
@@ -194,9 +194,9 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "4dd191872b1355fdd5afeb5bc36f086b7a7cbd73",
+    "sha1": "83e6565af11bca7a42fe0017524c250bfd41a786",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5434cf6d92267f23a08cf961d1f715d9d67d7611"
+    "sha2": "558b0c1c42dffcf351f41e6da8b0c4ce16a04ccb"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-test",
@@ -225,9 +225,9 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "5434cf6d92267f23a08cf961d1f715d9d67d7611",
+    "sha1": "558b0c1c42dffcf351f41e6da8b0c4ce16a04ccb",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d58141388b2aa0186ceb0db2deeeb7524540486a"
+    "sha2": "fd9628b56ee93421a409a2db96945ed127f86513"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-rest-test",
@@ -256,7 +256,7 @@
     "filePaths": [
         "array.js"
     ],
-    "sha1": "d58141388b2aa0186ceb0db2deeeb7524540486a",
+    "sha1": "fd9628b56ee93421a409a2db96945ed127f86513",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "33c7a858a16464d6fe8e27c69fc09f986fb56dae"
+    "sha2": "22ed3af33922a031abce541371bd068f494af4fa"
 }]
diff --git a/test/corpus/diff-summaries/javascript/arrow-function.json b/test/corpus/diff-summaries/javascript/arrow-function.json
index e0b71957a..84dc05034 100644
--- a/test/corpus/diff-summaries/javascript/arrow-function.json
+++ b/test/corpus/diff-summaries/javascript/arrow-function.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "b784ecef530da4646deff5aaff5d1263aa216ef3",
+    "sha1": "310d810758d43697a7d1f68f7c2ad1de0934f79f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b981ec4fb5850f454c25389b3cccdb678e94f626"
+    "sha2": "2aca5009ddb24def20fc4b80aa90e65cf83e6287"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "b981ec4fb5850f454c25389b3cccdb678e94f626",
+    "sha1": "2aca5009ddb24def20fc4b80aa90e65cf83e6287",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "419347ea5418439d6c4a0400799eef9ffe6ef5d2"
+    "sha2": "eddd286af90f25cbcc564adf3522b5fee63c381b"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "419347ea5418439d6c4a0400799eef9ffe6ef5d2",
+    "sha1": "eddd286af90f25cbcc564adf3522b5fee63c381b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c427f86b3d74e6605ac82591f26649df704049ce"
+    "sha2": "6138a0c287efe27683d7da56b540f628d207be49"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "c427f86b3d74e6605ac82591f26649df704049ce",
+    "sha1": "6138a0c287efe27683d7da56b540f628d207be49",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "89d1b4d2d18912e6cd8a0add7948ee3c8163a399"
+    "sha2": "1c261cfa73a316d78952d75179e99a2a0f248124"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "89d1b4d2d18912e6cd8a0add7948ee3c8163a399",
+    "sha1": "1c261cfa73a316d78952d75179e99a2a0f248124",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a77f256f44bf9d478cea9072b568053dfdfd7ff6"
+    "sha2": "01041b5122514cbee1adce9aa33f8f322483c3f8"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "a77f256f44bf9d478cea9072b568053dfdfd7ff6",
+    "sha1": "01041b5122514cbee1adce9aa33f8f322483c3f8",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "aa0b9c6500c4e90003954f42846c897acd910558"
+    "sha2": "81798791bb26de42a40d87aa38b5d3c99316deea"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "arrow-function.js"
     ],
-    "sha1": "aa0b9c6500c4e90003954f42846c897acd910558",
+    "sha1": "81798791bb26de42a40d87aa38b5d3c99316deea",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5a86b9e93eaf41a19163bf18d160b96b37245ee8"
+    "sha2": "8187976e3d4786bfa217b3f3eaeeac9f70a13ea5"
 }]
diff --git a/test/corpus/diff-summaries/javascript/assignment.json b/test/corpus/diff-summaries/javascript/assignment.json
index 7108f5fa4..caf729179 100644
--- a/test/corpus/diff-summaries/javascript/assignment.json
+++ b/test/corpus/diff-summaries/javascript/assignment.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "a561bcb5c9e49680fd9c162c616048bfa100277a",
+    "sha1": "9df019a66fceeb4b9cecca1b058461ba526a03a2",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3305579204370d2000328a15830609cd1a3cc048"
+    "sha2": "abc0b9c21be014e1803358d9154ddcbdcb2e9603"
 }
 ,{
     "testCaseDescription": "javascript-assignment-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "3305579204370d2000328a15830609cd1a3cc048",
+    "sha1": "abc0b9c21be014e1803358d9154ddcbdcb2e9603",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6df94e140941a17e62fc44b5695a49949169bfb1"
+    "sha2": "4a3ae2b56883e175c42af0ca35d94d6c4a26abcd"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "6df94e140941a17e62fc44b5695a49949169bfb1",
+    "sha1": "4a3ae2b56883e175c42af0ca35d94d6c4a26abcd",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "18468291d2bfbfce6c55fd4786eccde87ccb31f0"
+    "sha2": "12998dd07498a43b791d1e9e63b2ae27695a3c8b"
 }
 ,{
     "testCaseDescription": "javascript-assignment-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "18468291d2bfbfce6c55fd4786eccde87ccb31f0",
+    "sha1": "12998dd07498a43b791d1e9e63b2ae27695a3c8b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f9256802deb7eee30f243cbf5e99688511ae989e"
+    "sha2": "87a478c3e2641bbc2274e0121df51905b2eef9d3"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "f9256802deb7eee30f243cbf5e99688511ae989e",
+    "sha1": "87a478c3e2641bbc2274e0121df51905b2eef9d3",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ce267e2a4a95c57f1ccfbc0fb6d86c846a492757"
+    "sha2": "c054e3df2737567d2505878141a9981cdea468fc"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "ce267e2a4a95c57f1ccfbc0fb6d86c846a492757",
+    "sha1": "c054e3df2737567d2505878141a9981cdea468fc",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d7d26936a69a2962d5ec0b7b30ce6672df042253"
+    "sha2": "012137793eeeb2ffd4c13e9a349b8068bd3288bd"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "assignment.js"
     ],
-    "sha1": "d7d26936a69a2962d5ec0b7b30ce6672df042253",
+    "sha1": "012137793eeeb2ffd4c13e9a349b8068bd3288bd",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3b9571c33eac180e0dcf502ffe6eb68757aa50f2"
+    "sha2": "5637bee374845cc695e3bc4923ada9e2b7142487"
 }]
diff --git a/test/corpus/diff-summaries/javascript/bitwise-operator.json b/test/corpus/diff-summaries/javascript/bitwise-operator.json
index 10f1156b1..9ba975aed 100644
--- a/test/corpus/diff-summaries/javascript/bitwise-operator.json
+++ b/test/corpus/diff-summaries/javascript/bitwise-operator.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "8d428962767d348a3dbaa62c89eab0564badd448",
+    "sha1": "5d3d39ae21e1d026c21f7501f32b72afa7116391",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ca679b247a491625e6cadc6a0f3c74eb213024bb"
+    "sha2": "659cb3e63bc58b2cbb25a2cac6e3c1dbc53edc7e"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "ca679b247a491625e6cadc6a0f3c74eb213024bb",
+    "sha1": "659cb3e63bc58b2cbb25a2cac6e3c1dbc53edc7e",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "58c64d0c5d074267c5363722ac25292b13333b29"
+    "sha2": "b1479cf33d4c4894ecfbd0529c6e0a6fd959da27"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "58c64d0c5d074267c5363722ac25292b13333b29",
+    "sha1": "b1479cf33d4c4894ecfbd0529c6e0a6fd959da27",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3e73c91372d739bfcfceb92cb30be856b0674229"
+    "sha2": "78a5d010e0a8ca230cad79d095f89184b1103cf1"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "3e73c91372d739bfcfceb92cb30be856b0674229",
+    "sha1": "78a5d010e0a8ca230cad79d095f89184b1103cf1",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f5d62f9cf17ccc896f509f6b405805c39f45afc1"
+    "sha2": "7cf60ca0cec3bb7541b9b94cd920b6008bde596b"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "f5d62f9cf17ccc896f509f6b405805c39f45afc1",
+    "sha1": "7cf60ca0cec3bb7541b9b94cd920b6008bde596b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "db5c1b8fd336475343d489edab9cf0befd5a09d2"
+    "sha2": "52f8086542de127b6de6971e9ea58e318dc7810f"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "db5c1b8fd336475343d489edab9cf0befd5a09d2",
+    "sha1": "52f8086542de127b6de6971e9ea58e318dc7810f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8b532834c43b74f23cdf9da329f8d7d475acecad"
+    "sha2": "6ad465a190940140e2dfc4636640b22d5e84151e"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "bitwise-operator.js"
     ],
-    "sha1": "8b532834c43b74f23cdf9da329f8d7d475acecad",
+    "sha1": "6ad465a190940140e2dfc4636640b22d5e84151e",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1e420171d01e2dca638a5f134f88454bd64d79ae"
+    "sha2": "0c923b5d387e9451d743770787dc7e6349a2cdda"
 }]
diff --git a/test/corpus/diff-summaries/javascript/boolean-operator.json b/test/corpus/diff-summaries/javascript/boolean-operator.json
index c57164b1b..5c07a5491 100644
--- a/test/corpus/diff-summaries/javascript/boolean-operator.json
+++ b/test/corpus/diff-summaries/javascript/boolean-operator.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "faaff0e5dd144b090a540e45f9a534c1cceb3ad1",
+    "sha1": "2e1723970ed35de26fef7ca52568425a8cfa302c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d6e10ec4014abbcb6b6b338b66eb6f995a232d67"
+    "sha2": "5b7b9530df80fff2bf815ac07f2efbfaed037c2f"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "d6e10ec4014abbcb6b6b338b66eb6f995a232d67",
+    "sha1": "5b7b9530df80fff2bf815ac07f2efbfaed037c2f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b09e021bfef5da21754a88b63145c80bc8613308"
+    "sha2": "1b75ee1f551c6ddc5fb9939603a5d170a3d661dc"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-insert-test",
@@ -84,9 +84,9 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "b09e021bfef5da21754a88b63145c80bc8613308",
+    "sha1": "1b75ee1f551c6ddc5fb9939603a5d170a3d661dc",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3958808a1800344b293b9bc9d432b68041ff5d87"
+    "sha2": "c67ec8f100a61185a0ebd1d2a0997aac3172a081"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-replacement-test",
@@ -97,9 +97,9 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "3958808a1800344b293b9bc9d432b68041ff5d87",
+    "sha1": "c67ec8f100a61185a0ebd1d2a0997aac3172a081",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1625b72ec355c939829455d5397838e0328e6f39"
+    "sha2": "1796b452f10bc37a2ce5e51e0dfb155cad6a1113"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-replacement-test",
@@ -128,9 +128,9 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "1625b72ec355c939829455d5397838e0328e6f39",
+    "sha1": "1796b452f10bc37a2ce5e51e0dfb155cad6a1113",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a4f53d533f7359d95917a22771bc125f137dd311"
+    "sha2": "7680cb9ecf201d529c0b941f3cfae6df4410e179"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-test",
@@ -159,9 +159,9 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "a4f53d533f7359d95917a22771bc125f137dd311",
+    "sha1": "7680cb9ecf201d529c0b941f3cfae6df4410e179",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a1e71d859792a4497b9438fe57d0b17847b53184"
+    "sha2": "c3a3d72f73322c68daf961841b67ee7d170e2e6b"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-rest-test",
@@ -190,7 +190,7 @@
     "filePaths": [
         "boolean-operator.js"
     ],
-    "sha1": "a1e71d859792a4497b9438fe57d0b17847b53184",
+    "sha1": "c3a3d72f73322c68daf961841b67ee7d170e2e6b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e1dc429edadeaaff5ea72c53fefab478501bdc07"
+    "sha2": "d288c30308c25fa6d3d36b92cee298478e2897be"
 }]
diff --git a/test/corpus/diff-summaries/javascript/chained-callbacks.json b/test/corpus/diff-summaries/javascript/chained-callbacks.json
index 1d7daa334..bf6f54e8c 100644
--- a/test/corpus/diff-summaries/javascript/chained-callbacks.json
+++ b/test/corpus/diff-summaries/javascript/chained-callbacks.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "13cc6ff656f24edfd27ef7cdbbf33198c415c712",
+    "sha1": "95c9faf96aecf53875d3b5537c832aa9f07295bb",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ba8ce3f9c7e869e67a2b1d9ad2b98ea18b349916"
+    "sha2": "6d81f5f3719bf6ef617f182ea4ae270af8b8f1ba"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "ba8ce3f9c7e869e67a2b1d9ad2b98ea18b349916",
+    "sha1": "6d81f5f3719bf6ef617f182ea4ae270af8b8f1ba",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d0276aee638ca8e24ee6d91a339544df8fb7eda3"
+    "sha2": "e2b83629e5d644dba157e809a8bbfcfa890caa70"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-insert-test",
@@ -168,9 +168,9 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "d0276aee638ca8e24ee6d91a339544df8fb7eda3",
+    "sha1": "e2b83629e5d644dba157e809a8bbfcfa890caa70",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "85f3727c68cea10835a214942b66e4d430b73a62"
+    "sha2": "5da332af7a3b9ce66e0fe7cbf29102362f2a3324"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-replacement-test",
@@ -265,9 +265,9 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "85f3727c68cea10835a214942b66e4d430b73a62",
+    "sha1": "5da332af7a3b9ce66e0fe7cbf29102362f2a3324",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0726997ed14f742f2e3ad23f575cb88aaa5f4b98"
+    "sha2": "1c7f5d9e80a72f033f4e8d4d020fa018b809a402"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-replacement-test",
@@ -326,9 +326,9 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "0726997ed14f742f2e3ad23f575cb88aaa5f4b98",
+    "sha1": "1c7f5d9e80a72f033f4e8d4d020fa018b809a402",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "db6518a336784be0d8565f2ff963767dffbe22a0"
+    "sha2": "da050c033ed7366a4e07b985fe8448926e68dc64"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-test",
@@ -357,9 +357,9 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "db6518a336784be0d8565f2ff963767dffbe22a0",
+    "sha1": "da050c033ed7366a4e07b985fe8448926e68dc64",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f150e07a04ef679de98aa6a19c4e4d534230f7cc"
+    "sha2": "a555e34cfb9446c05585db5f31e8d20761b07c31"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-rest-test",
@@ -388,7 +388,7 @@
     "filePaths": [
         "chained-callbacks.js"
     ],
-    "sha1": "f150e07a04ef679de98aa6a19c4e4d534230f7cc",
+    "sha1": "a555e34cfb9446c05585db5f31e8d20761b07c31",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6b7dd7946b24ba4d49e866944f3bef05c4e948a5"
+    "sha2": "741bf83ad90154e0227763b9c8414ef153e69e5b"
 }]
diff --git a/test/corpus/diff-summaries/javascript/chained-property-access.json b/test/corpus/diff-summaries/javascript/chained-property-access.json
index 97e2e0513..30f1e0759 100644
--- a/test/corpus/diff-summaries/javascript/chained-property-access.json
+++ b/test/corpus/diff-summaries/javascript/chained-property-access.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "d18ce614bfee6bf352af0ace4d200778e8fb4eaf",
+    "sha1": "6e09527d4f46141f7ddc6695d3484f1b5accbed9",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "dd59773bcf047bb1a9af4a67c57647d6638492e9"
+    "sha2": "38dafd0b81a3980b74d2deb4741c7ef6023dea89"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "dd59773bcf047bb1a9af4a67c57647d6638492e9",
+    "sha1": "38dafd0b81a3980b74d2deb4741c7ef6023dea89",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2a35d54700748513ec68ec03f7f5047fac3c1d91"
+    "sha2": "8cd57aa7e0c92dbdb5ce7cf160db53a61d9c0a40"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-insert-test",
@@ -141,9 +141,9 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "2a35d54700748513ec68ec03f7f5047fac3c1d91",
+    "sha1": "8cd57aa7e0c92dbdb5ce7cf160db53a61d9c0a40",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "56c9c8d996ec55dc343c370027e921250704cda2"
+    "sha2": "b6a80efa7c62eed2afa1131bde8171489455e86d"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-replacement-test",
@@ -211,9 +211,9 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "56c9c8d996ec55dc343c370027e921250704cda2",
+    "sha1": "b6a80efa7c62eed2afa1131bde8171489455e86d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e27981a5a59769ef1b5d5b7d793413ea27df7d90"
+    "sha2": "6b27faa14e360c20419695c5c23169aae6f32202"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-replacement-test",
@@ -272,9 +272,9 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "e27981a5a59769ef1b5d5b7d793413ea27df7d90",
+    "sha1": "6b27faa14e360c20419695c5c23169aae6f32202",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "de1aa8b591a0eba6fc463f536626ac1ea4cba935"
+    "sha2": "7da461070750e42a1a4313f0379eadda2e633c4a"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-test",
@@ -303,9 +303,9 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "de1aa8b591a0eba6fc463f536626ac1ea4cba935",
+    "sha1": "7da461070750e42a1a4313f0379eadda2e633c4a",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4e04595fb1ccf12f0affa9d40a57d54e40b1bb2f"
+    "sha2": "1cc7b8dba24f66277fd87490606bda3cc6c4b71a"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-rest-test",
@@ -334,7 +334,7 @@
     "filePaths": [
         "chained-property-access.js"
     ],
-    "sha1": "4e04595fb1ccf12f0affa9d40a57d54e40b1bb2f",
+    "sha1": "1cc7b8dba24f66277fd87490606bda3cc6c4b71a",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0ae29a51ae1d4aa57c5239393081efaf63982b12"
+    "sha2": "b9fefd0fbd4aec64387e7195404fb142ddc27510"
 }]
diff --git a/test/corpus/diff-summaries/javascript/class.json b/test/corpus/diff-summaries/javascript/class.json
index 05e58aaff..039db5fd3 100644
--- a/test/corpus/diff-summaries/javascript/class.json
+++ b/test/corpus/diff-summaries/javascript/class.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "d17a2b38a62067233adf6ee07cd8e79c78862e83",
+    "sha1": "06e7d3f6809cd80fa2855f8bcf2e0962d931c670",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b3c38949d2744c30985b401eeb4a8d5968214038"
+    "sha2": "3d5c548afff2a731a81369b987ab33269cc34c9e"
 }
 ,{
     "testCaseDescription": "javascript-class-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "b3c38949d2744c30985b401eeb4a8d5968214038",
+    "sha1": "3d5c548afff2a731a81369b987ab33269cc34c9e",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7b2f9b1099f78cc3f7e78764536742adcf9c371f"
+    "sha2": "7780979c1049904f86e3cee1502d605728729aeb"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-insert-test",
@@ -168,9 +168,9 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "7b2f9b1099f78cc3f7e78764536742adcf9c371f",
+    "sha1": "7780979c1049904f86e3cee1502d605728729aeb",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c6b41195ff78d15375ecad210138f106b491c397"
+    "sha2": "9b68ed5855f04406f05e5af323e117bcd7db61ed"
 }
 ,{
     "testCaseDescription": "javascript-class-replacement-test",
@@ -265,9 +265,9 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "c6b41195ff78d15375ecad210138f106b491c397",
+    "sha1": "9b68ed5855f04406f05e5af323e117bcd7db61ed",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "72d9f8358863431e6f9ded0aed0877dd974afd24"
+    "sha2": "37e0a093175ae550a07287b953c5ae029ce5bd3a"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-replacement-test",
@@ -326,9 +326,9 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "72d9f8358863431e6f9ded0aed0877dd974afd24",
+    "sha1": "37e0a093175ae550a07287b953c5ae029ce5bd3a",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "41fbfe38957d1857423e745ab7cc6af99470141b"
+    "sha2": "c58870c5f630edfc88dbfbc9cef490e35fcb4adb"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-test",
@@ -357,9 +357,9 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "41fbfe38957d1857423e745ab7cc6af99470141b",
+    "sha1": "c58870c5f630edfc88dbfbc9cef490e35fcb4adb",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "741d75c2f76964d86375e18fb7154936b746410a"
+    "sha2": "d04dea3345101ccd8d68b0765e8a80e741769c8b"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-rest-test",
@@ -388,7 +388,7 @@
     "filePaths": [
         "class.js"
     ],
-    "sha1": "741d75c2f76964d86375e18fb7154936b746410a",
+    "sha1": "d04dea3345101ccd8d68b0765e8a80e741769c8b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e3605367f3839bdb67e5ef00ea3be0afdd7d72aa"
+    "sha2": "6b12d49c832613e5148502e9ca79e8989b0a1246"
 }]
diff --git a/test/corpus/diff-summaries/javascript/comma-operator.json b/test/corpus/diff-summaries/javascript/comma-operator.json
index 1d00da3aa..bf2df1577 100644
--- a/test/corpus/diff-summaries/javascript/comma-operator.json
+++ b/test/corpus/diff-summaries/javascript/comma-operator.json
@@ -40,9 +40,9 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "93d092557623a476afac612ad5053ab3e5a63d69",
+    "sha1": "6c5c458dc7b7cacde82728c59a54fba7f1e379da",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "925d714e520d236f773fd66415cc85d568567c28"
+    "sha2": "305752991fb732934114c752a9cf6c258dcda082"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-replacement-insert-test",
@@ -101,9 +101,9 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "925d714e520d236f773fd66415cc85d568567c28",
+    "sha1": "305752991fb732934114c752a9cf6c258dcda082",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "62b94cc1adb6550f6cc3d5487fa0b2fb98f7f64a"
+    "sha2": "ccbdbab8aae61fc3fe84c61be0553e3aa298aede"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-insert-test",
@@ -162,9 +162,9 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "62b94cc1adb6550f6cc3d5487fa0b2fb98f7f64a",
+    "sha1": "ccbdbab8aae61fc3fe84c61be0553e3aa298aede",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a4b777d2bcbeb98a22c575be5aed21065915ca25"
+    "sha2": "10275a17b680928492a5768a487330b9fb6f01b8"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-replacement-test",
@@ -223,9 +223,9 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "a4b777d2bcbeb98a22c575be5aed21065915ca25",
+    "sha1": "10275a17b680928492a5768a487330b9fb6f01b8",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0044976b6fe9bc1a88363179b05c9164d020d6e0"
+    "sha2": "8d1e66864038b321e35163bafe880f1d09fdb4d0"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-replacement-test",
@@ -299,9 +299,9 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "0044976b6fe9bc1a88363179b05c9164d020d6e0",
+    "sha1": "8d1e66864038b321e35163bafe880f1d09fdb4d0",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "437b6ad23f402553fa54eabc101e1009fe7e90f7"
+    "sha2": "6b9a43ec0950ce98f5a57536da72b88b3a6596a6"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-test",
@@ -345,9 +345,9 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "437b6ad23f402553fa54eabc101e1009fe7e90f7",
+    "sha1": "6b9a43ec0950ce98f5a57536da72b88b3a6596a6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "cf7b30999c40f435c936f1ca0dafda480f24624b"
+    "sha2": "07e7049d1dfd37d6daaf871ec9b87d18a6313738"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-rest-test",
@@ -376,7 +376,7 @@
     "filePaths": [
         "comma-operator.js"
     ],
-    "sha1": "cf7b30999c40f435c936f1ca0dafda480f24624b",
+    "sha1": "07e7049d1dfd37d6daaf871ec9b87d18a6313738",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b0f399ee205a0929d5082717bdff84b949f064b3"
+    "sha2": "812109a460936204e1340534b0ba9e1c13f609db"
 }]
diff --git a/test/corpus/diff-summaries/javascript/comment.json b/test/corpus/diff-summaries/javascript/comment.json
index dc5cc6ef1..3d88506cb 100644
--- a/test/corpus/diff-summaries/javascript/comment.json
+++ b/test/corpus/diff-summaries/javascript/comment.json
@@ -7,9 +7,9 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "9966bf3346783a8e39f77cc3b61f8c24f851b0ed",
+    "sha1": "75f6e09cda9acd9fd101ccd69ad7b4ea6c0d0e35",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0b532cc7ac2078fb6421efad2fba431eebf8b079"
+    "sha2": "aeccb445624ea339570d489dc90f7da5de745151"
 }
 ,{
     "testCaseDescription": "javascript-comment-replacement-insert-test",
@@ -20,9 +20,9 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "0b532cc7ac2078fb6421efad2fba431eebf8b079",
+    "sha1": "aeccb445624ea339570d489dc90f7da5de745151",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "22391ec032d8cf2569c2c79daf9edd535fd5ae1f"
+    "sha2": "577207a137ad7bb081f5597a864ec11173952673"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-insert-test",
@@ -33,9 +33,9 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "22391ec032d8cf2569c2c79daf9edd535fd5ae1f",
+    "sha1": "577207a137ad7bb081f5597a864ec11173952673",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d2e01036c8e33e37b082368f832c642e1498419d"
+    "sha2": "0a6a155c94b7d1f86e7301c5b7887caba0640455"
 }
 ,{
     "testCaseDescription": "javascript-comment-replacement-test",
@@ -46,9 +46,9 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "d2e01036c8e33e37b082368f832c642e1498419d",
+    "sha1": "0a6a155c94b7d1f86e7301c5b7887caba0640455",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "53dd565d968e321c83e7d55a640b941ec039ae9d"
+    "sha2": "9a3bdda312ddc2a0b94d910d021d8700e7b3a238"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-replacement-test",
@@ -59,9 +59,9 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "53dd565d968e321c83e7d55a640b941ec039ae9d",
+    "sha1": "9a3bdda312ddc2a0b94d910d021d8700e7b3a238",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f44bdb127231af5416f02054c41452de18136eb1"
+    "sha2": "ace162e3651e0e5ac500e3d7c42a4c1512223129"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-test",
@@ -72,9 +72,9 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "f44bdb127231af5416f02054c41452de18136eb1",
+    "sha1": "ace162e3651e0e5ac500e3d7c42a4c1512223129",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4d5c2aa9348d27a4efe63e93dd6ea597d1ab60f0"
+    "sha2": "8a91f08cca875280b424971b1d7c2135b885fc36"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-rest-test",
@@ -85,7 +85,7 @@
     "filePaths": [
         "comment.js"
     ],
-    "sha1": "4d5c2aa9348d27a4efe63e93dd6ea597d1ab60f0",
+    "sha1": "8a91f08cca875280b424971b1d7c2135b885fc36",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d0223efd366c0d9b703a6edf4b9961fa26add3cb"
+    "sha2": "3f14b89be8e02338d015ff10003ca251fe905a3d"
 }]
diff --git a/test/corpus/diff-summaries/javascript/constructor-call.json b/test/corpus/diff-summaries/javascript/constructor-call.json
index abe952ed7..afdea3a1d 100644
--- a/test/corpus/diff-summaries/javascript/constructor-call.json
+++ b/test/corpus/diff-summaries/javascript/constructor-call.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "d338b275731ec3d9b527339e1ac1b99f43ea5ea2",
+    "sha1": "3a069a7c4ad0186d90ae7e637d2de16a5c3363f7",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "07f0e420ba82a7a88edead9753bf001dc427c900"
+    "sha2": "069b0825bbafb97717d4c17c675eb08a9e631a6d"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "07f0e420ba82a7a88edead9753bf001dc427c900",
+    "sha1": "069b0825bbafb97717d4c17c675eb08a9e631a6d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0ead57e4c68d3441874607df82f10cfae180871c"
+    "sha2": "121a2526a02ba868c2b413686bbb6f4385cc845c"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "0ead57e4c68d3441874607df82f10cfae180871c",
+    "sha1": "121a2526a02ba868c2b413686bbb6f4385cc845c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5312cfad6882b93031aaa4aa6bf94db1cb6097a1"
+    "sha2": "378109a21204d3f2d4e3bacf0317252cd2173c75"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "5312cfad6882b93031aaa4aa6bf94db1cb6097a1",
+    "sha1": "378109a21204d3f2d4e3bacf0317252cd2173c75",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d1ce2f7e01d8a6fb58e25e00612be76b5a92129b"
+    "sha2": "4f4a30af7097be0c1d5454f19198fd615b625848"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "d1ce2f7e01d8a6fb58e25e00612be76b5a92129b",
+    "sha1": "4f4a30af7097be0c1d5454f19198fd615b625848",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f2947ecde2c4966ba63934c2bf9fadb1bf9494a5"
+    "sha2": "5b0a5d3438f727722da4bc5ae40b853d5590ce00"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "f2947ecde2c4966ba63934c2bf9fadb1bf9494a5",
+    "sha1": "5b0a5d3438f727722da4bc5ae40b853d5590ce00",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3f2450813b57ef20f48fafa20ec30d660a296e5c"
+    "sha2": "75ee991e79abc180fd0320eb497bd2751386042b"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "constructor-call.js"
     ],
-    "sha1": "3f2450813b57ef20f48fafa20ec30d660a296e5c",
+    "sha1": "75ee991e79abc180fd0320eb497bd2751386042b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d6f65326cb55e5d2b83057d59ae062b3f4bc778e"
+    "sha2": "81afc47a05a4fc029bb8ab13af5c6bcfd145f3d8"
 }]
diff --git a/test/corpus/diff-summaries/javascript/delete-operator.json b/test/corpus/diff-summaries/javascript/delete-operator.json
index cb7a6b757..f483b4ea7 100644
--- a/test/corpus/diff-summaries/javascript/delete-operator.json
+++ b/test/corpus/diff-summaries/javascript/delete-operator.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "660d4f31a366c484dcf287cc129d2236e0064639",
+    "sha1": "272bb441df6d491a32ed96aaa6c7db3bc6ecc4e6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "dcdf4363cc41756d111762831febfeb2bc5c3561"
+    "sha2": "7852811aec98c92549f214b9bdc2112503e91263"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "dcdf4363cc41756d111762831febfeb2bc5c3561",
+    "sha1": "7852811aec98c92549f214b9bdc2112503e91263",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b9195fb8317d07798a424a3ad5897669cf2fec4d"
+    "sha2": "f63a1d108ad747132f80e24a7cc5d2eba6869953"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "b9195fb8317d07798a424a3ad5897669cf2fec4d",
+    "sha1": "f63a1d108ad747132f80e24a7cc5d2eba6869953",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b1aa406089e4aafef90ec5732ba443d1031f561e"
+    "sha2": "cc82691fc1d9994aa11a796ce8d19036aa643700"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "b1aa406089e4aafef90ec5732ba443d1031f561e",
+    "sha1": "cc82691fc1d9994aa11a796ce8d19036aa643700",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3d47f770de2c100cdd3f5cfcb8bc43f582e4a368"
+    "sha2": "b6740def3866ee051f572192580bc5c8d1a37482"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "3d47f770de2c100cdd3f5cfcb8bc43f582e4a368",
+    "sha1": "b6740def3866ee051f572192580bc5c8d1a37482",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "79ed3766548499729284c8eb3ff3cecfaed80a4c"
+    "sha2": "48fa52033e2b468c94cebed83e0c2be416215056"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "79ed3766548499729284c8eb3ff3cecfaed80a4c",
+    "sha1": "48fa52033e2b468c94cebed83e0c2be416215056",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3b8b6b7c801a89beb229c8f9b705be4d4465b622"
+    "sha2": "98770c8508f266f52ac7b5f92fbf21ba2ad742e8"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "delete-operator.js"
     ],
-    "sha1": "3b8b6b7c801a89beb229c8f9b705be4d4465b622",
+    "sha1": "98770c8508f266f52ac7b5f92fbf21ba2ad742e8",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8f71c3ee15ecf75d5d1aa9d7f9e82346c26b78e1"
+    "sha2": "cf84ce174ee50853417b662234d6c10cffd9535f"
 }]
diff --git a/test/corpus/diff-summaries/javascript/do-while-statement.json b/test/corpus/diff-summaries/javascript/do-while-statement.json
index 6b1906a61..fe25f38e1 100644
--- a/test/corpus/diff-summaries/javascript/do-while-statement.json
+++ b/test/corpus/diff-summaries/javascript/do-while-statement.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "c5a33a05e7c473051b69c27b5268f7e73d9f9818",
+    "sha1": "7a9375e4ae65b8660781566a69189122dba26f52",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f6d13c24db646eabb87a5569fab5dc059397cd41"
+    "sha2": "153fc4460fb06d77c604d63f3c5d4ae9d03ad87b"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "f6d13c24db646eabb87a5569fab5dc059397cd41",
+    "sha1": "153fc4460fb06d77c604d63f3c5d4ae9d03ad87b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b97e52feb5f9b94c2f7c035a5c0b741ab2709c11"
+    "sha2": "cae442ad8626372a08ab86bc4d62190644dd1bb6"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-insert-test",
@@ -141,9 +141,9 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "b97e52feb5f9b94c2f7c035a5c0b741ab2709c11",
+    "sha1": "cae442ad8626372a08ab86bc4d62190644dd1bb6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "618521ec11773660442d22c09e5616569ee0d4d6"
+    "sha2": "335b419d46d706143f503b249530903b4b0bcb6d"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-replacement-test",
@@ -211,9 +211,9 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "618521ec11773660442d22c09e5616569ee0d4d6",
+    "sha1": "335b419d46d706143f503b249530903b4b0bcb6d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b058c2ef89ec07779649681bb0867d7ca642a924"
+    "sha2": "09dff87148af3c1a532b09d2cc70c3da83bdc8a6"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-replacement-test",
@@ -272,9 +272,9 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "b058c2ef89ec07779649681bb0867d7ca642a924",
+    "sha1": "09dff87148af3c1a532b09d2cc70c3da83bdc8a6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "29a60219132b7497d5f2f2da75cd6fad3583ea3e"
+    "sha2": "6207dfd21eb4903bea420ab62feaa29e6af091d6"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-test",
@@ -303,9 +303,9 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "29a60219132b7497d5f2f2da75cd6fad3583ea3e",
+    "sha1": "6207dfd21eb4903bea420ab62feaa29e6af091d6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2c0695fb799f92e9549bea04968f0a7db55e5084"
+    "sha2": "9bf55f0037fbdcc563760eda941c624cd0fb7ee4"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-rest-test",
@@ -334,7 +334,7 @@
     "filePaths": [
         "do-while-statement.js"
     ],
-    "sha1": "2c0695fb799f92e9549bea04968f0a7db55e5084",
+    "sha1": "9bf55f0037fbdcc563760eda941c624cd0fb7ee4",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "64789b8e632a3b70997ef3abb4ce031bb19cbedb"
+    "sha2": "5264bb45932440f7188ec9e954a53ae021937c3d"
 }]
diff --git a/test/corpus/diff-summaries/javascript/false.json b/test/corpus/diff-summaries/javascript/false.json
index 6798a209c..7273512e8 100644
--- a/test/corpus/diff-summaries/javascript/false.json
+++ b/test/corpus/diff-summaries/javascript/false.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "6f781fd1c75a5c824323b66e61fb2717755b4753",
+    "sha1": "b03bf490799a695bd4e3f8aec89f4abc36a52a03",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4973cc5fa83113e784f59efc0e9e2bee97ac8a4d"
+    "sha2": "80a908a7cd9e332f8dfdf6a02ef2513cba0e6776"
 }
 ,{
     "testCaseDescription": "javascript-false-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "4973cc5fa83113e784f59efc0e9e2bee97ac8a4d",
+    "sha1": "80a908a7cd9e332f8dfdf6a02ef2513cba0e6776",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6bd0e7e033d1921b69c9740f08c5575c7e5e6ee1"
+    "sha2": "62075b30eed07c7c5d776b20486664b5726a52c3"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-insert-test",
@@ -117,9 +117,9 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "6bd0e7e033d1921b69c9740f08c5575c7e5e6ee1",
+    "sha1": "62075b30eed07c7c5d776b20486664b5726a52c3",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b2db9c4bb0b3a8d6b68d683e8513b2f6efedb44b"
+    "sha2": "a103b16e13a09f7320ee79d79c854d9cec2629e1"
 }
 ,{
     "testCaseDescription": "javascript-false-replacement-test",
@@ -163,9 +163,9 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "b2db9c4bb0b3a8d6b68d683e8513b2f6efedb44b",
+    "sha1": "a103b16e13a09f7320ee79d79c854d9cec2629e1",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "dd9ec604931ffffba1b6c7bd4773ec8ac5418804"
+    "sha2": "b70e2293e646523a624a325f8c78dccf77f2e805"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-replacement-test",
@@ -224,9 +224,9 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "dd9ec604931ffffba1b6c7bd4773ec8ac5418804",
+    "sha1": "b70e2293e646523a624a325f8c78dccf77f2e805",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4b8dddf41a7b9ac76de8ff5eb1327fb0bd1f8dcb"
+    "sha2": "18d248ab8ac37507a947e553007f1bb1e88cbac7"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-test",
@@ -255,9 +255,9 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "4b8dddf41a7b9ac76de8ff5eb1327fb0bd1f8dcb",
+    "sha1": "18d248ab8ac37507a947e553007f1bb1e88cbac7",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2f2527a35cc4511ba3e91e4360f61e56f20d9c3e"
+    "sha2": "0787a6b71becee29f6fdb2fba4e74715b394fb93"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-rest-test",
@@ -286,7 +286,7 @@
     "filePaths": [
         "false.js"
     ],
-    "sha1": "2f2527a35cc4511ba3e91e4360f61e56f20d9c3e",
+    "sha1": "0787a6b71becee29f6fdb2fba4e74715b394fb93",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7f7c1c904ffcc4ea539925a1d336147d84fd90b8"
+    "sha2": "9cae4ca0ce573739d1af93874cad0aec8fa71a75"
 }]
diff --git a/test/corpus/diff-summaries/javascript/for-in-statement.json b/test/corpus/diff-summaries/javascript/for-in-statement.json
index c25af1144..b890c5314 100644
--- a/test/corpus/diff-summaries/javascript/for-in-statement.json
+++ b/test/corpus/diff-summaries/javascript/for-in-statement.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "1e9729897fa1da1617386fa8da290df973dadc93",
+    "sha1": "e7516ed1f22068d09fedc39776e08241e7aeeb42",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e5d8b7d6f07410e2fa00bbec5718bbdf061166fa"
+    "sha2": "2fcd3bac5d32fcf39c48693aad3e5982f93e9791"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "e5d8b7d6f07410e2fa00bbec5718bbdf061166fa",
+    "sha1": "2fcd3bac5d32fcf39c48693aad3e5982f93e9791",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6c8ba52447c2faf8fed1eba65cd64c643003461f"
+    "sha2": "b2d7bbb372e296375012b88664d66d45f62d634d"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-insert-test",
@@ -168,9 +168,9 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "6c8ba52447c2faf8fed1eba65cd64c643003461f",
+    "sha1": "b2d7bbb372e296375012b88664d66d45f62d634d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "bc392f77e718987c79b53126053665c245b163ac"
+    "sha2": "1274688f96d3ad00d7ebf95e3d043c6c3a76aed0"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-replacement-test",
@@ -265,9 +265,9 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "bc392f77e718987c79b53126053665c245b163ac",
+    "sha1": "1274688f96d3ad00d7ebf95e3d043c6c3a76aed0",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "da2eb693e4cc262362cb81c3fdd040af92eecc42"
+    "sha2": "f0049039892114bcb481a5b4d4694dc8deba388f"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-replacement-test",
@@ -326,9 +326,9 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "da2eb693e4cc262362cb81c3fdd040af92eecc42",
+    "sha1": "f0049039892114bcb481a5b4d4694dc8deba388f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "210a8ed2aa30b91ca470694492daa7412c616d58"
+    "sha2": "2159c9228cf8e7d40481462544af3e9a0c7318b5"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-test",
@@ -357,9 +357,9 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "210a8ed2aa30b91ca470694492daa7412c616d58",
+    "sha1": "2159c9228cf8e7d40481462544af3e9a0c7318b5",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "89852450722771842d4365c760a1403957fc7c96"
+    "sha2": "fb05e5aff7d98c7957d5856cfb3b2ae3b0430a28"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-rest-test",
@@ -388,7 +388,7 @@
     "filePaths": [
         "for-in-statement.js"
     ],
-    "sha1": "89852450722771842d4365c760a1403957fc7c96",
+    "sha1": "fb05e5aff7d98c7957d5856cfb3b2ae3b0430a28",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e572fcdd9abd2fa13fdff57a3afd8b3c43a6c6a0"
+    "sha2": "eca7986c7901ba7a91dcd5eb9a19c01155284bbe"
 }]
diff --git a/test/corpus/diff-summaries/javascript/for-loop-with-in-statement.json b/test/corpus/diff-summaries/javascript/for-loop-with-in-statement.json
index 1b5a5527c..0270a4b78 100644
--- a/test/corpus/diff-summaries/javascript/for-loop-with-in-statement.json
+++ b/test/corpus/diff-summaries/javascript/for-loop-with-in-statement.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "954a81d340fc574299386d998fb6cd667fe875ce",
+    "sha1": "e6346af00a514ebc5c362eefbe3515835c3bf0db",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8e7957d2f5b2ec1db4345678a2abc67205202d7f"
+    "sha2": "8d70e8a074f9f16c9e4335bc865c432d8eb338a5"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "8e7957d2f5b2ec1db4345678a2abc67205202d7f",
+    "sha1": "8d70e8a074f9f16c9e4335bc865c432d8eb338a5",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8aafa0ba7361d24eecc7b67f364b96fb0e1783d9"
+    "sha2": "049f6890b3a4cd918f7d4c836faa399561ce1c6c"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-insert-test",
@@ -141,9 +141,9 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "8aafa0ba7361d24eecc7b67f364b96fb0e1783d9",
+    "sha1": "049f6890b3a4cd918f7d4c836faa399561ce1c6c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ba14e6d7fb2d573306e97d6440a31bfd4ba358f7"
+    "sha2": "1299e010f86e62b876a854d53ad61d7b607e5155"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-replacement-test",
@@ -211,9 +211,9 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "ba14e6d7fb2d573306e97d6440a31bfd4ba358f7",
+    "sha1": "1299e010f86e62b876a854d53ad61d7b607e5155",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "99930dbd3a9f28d37aeda9c4746c210df0912e72"
+    "sha2": "6778e74eaf409d677030b34d00b50e28b6c949d7"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-replacement-test",
@@ -272,9 +272,9 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "99930dbd3a9f28d37aeda9c4746c210df0912e72",
+    "sha1": "6778e74eaf409d677030b34d00b50e28b6c949d7",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "eb0f914082b22114ac7e3a487bec4dae17770ebc"
+    "sha2": "080be12bd23d5379c82b1d72a8a35cc32829c62c"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-test",
@@ -303,9 +303,9 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "eb0f914082b22114ac7e3a487bec4dae17770ebc",
+    "sha1": "080be12bd23d5379c82b1d72a8a35cc32829c62c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d5ae13f5b72c809e77f06665c3eae01cfcf76533"
+    "sha2": "20da4a34aab181dcf72a2c7256043d235f768517"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-rest-test",
@@ -334,7 +334,7 @@
     "filePaths": [
         "for-loop-with-in-statement.js"
     ],
-    "sha1": "d5ae13f5b72c809e77f06665c3eae01cfcf76533",
+    "sha1": "20da4a34aab181dcf72a2c7256043d235f768517",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "65cf271429cfd2f26c112bf377c0fc4f8d79cba4"
+    "sha2": "0a5c20d9302d0a939b9ac9311915f181f7e3868f"
 }]
diff --git a/test/corpus/diff-summaries/javascript/for-of-statement.json b/test/corpus/diff-summaries/javascript/for-of-statement.json
index 23caf4e29..e2ebd029b 100644
--- a/test/corpus/diff-summaries/javascript/for-of-statement.json
+++ b/test/corpus/diff-summaries/javascript/for-of-statement.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "89db44a937a7093bce4f9707fef198d801d1df6c",
+    "sha1": "5a92b9552b387a2cb0cae2ceb0995290506ec462",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2446083ac07858819361d2b6f4d56e5acb211e1f"
+    "sha2": "dc9e26e52ad05f431930e52eb9556716b0a1eb2a"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "2446083ac07858819361d2b6f4d56e5acb211e1f",
+    "sha1": "dc9e26e52ad05f431930e52eb9556716b0a1eb2a",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3ef3da8fb378a9e3eb0481df414aeebd601a9c58"
+    "sha2": "01369765036151e2e764c5fac670f43f621150c5"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-insert-test",
@@ -168,9 +168,9 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "3ef3da8fb378a9e3eb0481df414aeebd601a9c58",
+    "sha1": "01369765036151e2e764c5fac670f43f621150c5",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "27d445ebbe6a2d1428363a86b0d8a72f7c3a1fa7"
+    "sha2": "5aff693233623ca2d8a9c134c958a3d5f5b8e8b2"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-replacement-test",
@@ -265,9 +265,9 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "27d445ebbe6a2d1428363a86b0d8a72f7c3a1fa7",
+    "sha1": "5aff693233623ca2d8a9c134c958a3d5f5b8e8b2",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7c22bba4de0d72a6896a92034976544f0cf981d9"
+    "sha2": "46946cec14901dd738817ada4c6e6fa720377adb"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-replacement-test",
@@ -326,9 +326,9 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "7c22bba4de0d72a6896a92034976544f0cf981d9",
+    "sha1": "46946cec14901dd738817ada4c6e6fa720377adb",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9a4e4fb16b79c73d23f19d5e01de22370f426681"
+    "sha2": "32d78e31403b7aafa1ce3319ef04e6aef4d7117b"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-test",
@@ -357,9 +357,9 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "9a4e4fb16b79c73d23f19d5e01de22370f426681",
+    "sha1": "32d78e31403b7aafa1ce3319ef04e6aef4d7117b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "cf9946632e343e7067c51a06f3e18f62fabbdb54"
+    "sha2": "60c1b1fbd323697a85652b6f16a462391213528d"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-rest-test",
@@ -388,7 +388,7 @@
     "filePaths": [
         "for-of-statement.js"
     ],
-    "sha1": "cf9946632e343e7067c51a06f3e18f62fabbdb54",
+    "sha1": "60c1b1fbd323697a85652b6f16a462391213528d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "67ef9e8da7b64fdbdf370b43e4c780e28ae9efdf"
+    "sha2": "ee87756c4741394f6e27cda0b1a7b846bdf80f1c"
 }]
diff --git a/test/corpus/diff-summaries/javascript/for-statement.json b/test/corpus/diff-summaries/javascript/for-statement.json
index e4c05b216..6bbbed13c 100644
--- a/test/corpus/diff-summaries/javascript/for-statement.json
+++ b/test/corpus/diff-summaries/javascript/for-statement.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "de443cf00be9a98ac907413bfb98ae7b8db27831",
+    "sha1": "afd6b9f1e5af87bcadf294ebacd0223e87a87f0f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ee7de8213f031a170e082ef6e72ed09cb1c78ddd"
+    "sha2": "3ac8c8066817aad98f661ea70b97cd3c65afe871"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "ee7de8213f031a170e082ef6e72ed09cb1c78ddd",
+    "sha1": "3ac8c8066817aad98f661ea70b97cd3c65afe871",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3561a122a3823f4dae34a38b8308a08c84dd96f8"
+    "sha2": "fe2d6497181fd4d60394530faf253f4952597e32"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "3561a122a3823f4dae34a38b8308a08c84dd96f8",
+    "sha1": "fe2d6497181fd4d60394530faf253f4952597e32",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "45cc625c20823056b697a08119111b3849855d04"
+    "sha2": "d9087fce4532f202b760eca527c4f41ce9f15604"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "45cc625c20823056b697a08119111b3849855d04",
+    "sha1": "d9087fce4532f202b760eca527c4f41ce9f15604",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "634af4fd56a8cb4fb227f1505cad159b0aab1036"
+    "sha2": "4e4b8badcfe067ff469bc02935302b9b9669c6b3"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "634af4fd56a8cb4fb227f1505cad159b0aab1036",
+    "sha1": "4e4b8badcfe067ff469bc02935302b9b9669c6b3",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ae4347d2058f6cd47934f4b95215446aaa82b749"
+    "sha2": "934c051e50b80c79864a583016a522f1168530c9"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "ae4347d2058f6cd47934f4b95215446aaa82b749",
+    "sha1": "934c051e50b80c79864a583016a522f1168530c9",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "aa911951d4d68356f23d3090ab0bddf3d9f5c6f1"
+    "sha2": "9f4247b1e60ad7c26755288b505617cf7cebb614"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "for-statement.js"
     ],
-    "sha1": "aa911951d4d68356f23d3090ab0bddf3d9f5c6f1",
+    "sha1": "9f4247b1e60ad7c26755288b505617cf7cebb614",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4e9ef9bf5e742b75d10cac3498f637ab763b6c99"
+    "sha2": "7cf665ea23a82690e716e213814929b169bea1b7"
 }]
diff --git a/test/corpus/diff-summaries/javascript/function-call-args.json b/test/corpus/diff-summaries/javascript/function-call-args.json
index 3713d4d2d..7e2eb5f6d 100644
--- a/test/corpus/diff-summaries/javascript/function-call-args.json
+++ b/test/corpus/diff-summaries/javascript/function-call-args.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "667c51b29a73971928a1be313c249304f3828099",
+    "sha1": "e6533feee92c26edc023c24b134a8bdcf9460ad4",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "192575f8455ac438aa0cbfab74d84d4183377778"
+    "sha2": "f789839824aa589524ca70851831acfcdbec7310"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "192575f8455ac438aa0cbfab74d84d4183377778",
+    "sha1": "f789839824aa589524ca70851831acfcdbec7310",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1acb1db7befa63bf81039b1201e46d1c93f89aa6"
+    "sha2": "e4bdd869ccbb16bfb8ba73e8fcb7869e0ef83bb4"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-insert-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "1acb1db7befa63bf81039b1201e46d1c93f89aa6",
+    "sha1": "e4bdd869ccbb16bfb8ba73e8fcb7869e0ef83bb4",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1ef1f93e8742c827b5e36dce1b2a58d084940f00"
+    "sha2": "b3fa6d5a71ec55483abc87e7dfee823939e1d38a"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-replacement-test",
@@ -427,9 +427,9 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "1ef1f93e8742c827b5e36dce1b2a58d084940f00",
+    "sha1": "b3fa6d5a71ec55483abc87e7dfee823939e1d38a",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9610dd7ef8edff8b65d81c889cb22aa5efb67019"
+    "sha2": "2145846bfe8b2bb3ff5ae35443621575fd72ad13"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-replacement-test",
@@ -488,9 +488,9 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "9610dd7ef8edff8b65d81c889cb22aa5efb67019",
+    "sha1": "2145846bfe8b2bb3ff5ae35443621575fd72ad13",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ad2d4d347fb4551d07b8970a27634569e6f9b789"
+    "sha2": "c43ed27125996dd57f783809abd014950d032586"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-test",
@@ -519,9 +519,9 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "ad2d4d347fb4551d07b8970a27634569e6f9b789",
+    "sha1": "c43ed27125996dd57f783809abd014950d032586",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "953921a66be0d1ed61bf4db6884cd0ad0a057f07"
+    "sha2": "64cea9080f67e54c79f17720ba1a623a09fbb18d"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-rest-test",
@@ -550,7 +550,7 @@
     "filePaths": [
         "function-call-args.js"
     ],
-    "sha1": "953921a66be0d1ed61bf4db6884cd0ad0a057f07",
+    "sha1": "64cea9080f67e54c79f17720ba1a623a09fbb18d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6f3b3d0ccb1f85f9dd79220ea588b11e540d7290"
+    "sha2": "7e01c39890cac76a3d4316a982857273f7aa1b4b"
 }]
diff --git a/test/corpus/diff-summaries/javascript/function-call.json b/test/corpus/diff-summaries/javascript/function-call.json
index 42bb0859e..5a6088ee0 100644
--- a/test/corpus/diff-summaries/javascript/function-call.json
+++ b/test/corpus/diff-summaries/javascript/function-call.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "4b213c3b88b5e8aace51dfa0379aaa8de01536b8",
+    "sha1": "a5238394020bfb43417e960688ccb61c97dd27a4",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "77cb0c7af7488197be59308f1296a909bd4dc5b6"
+    "sha2": "b2518532d284450894a4c02f9e035485f38c2060"
 }
 ,{
     "testCaseDescription": "javascript-function-call-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "77cb0c7af7488197be59308f1296a909bd4dc5b6",
+    "sha1": "b2518532d284450894a4c02f9e035485f38c2060",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1b4585f4d837d2412aa2349b729616df4be4dfc3"
+    "sha2": "ee34446d4e4c90a2e53e558483c0d6b39954816b"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "1b4585f4d837d2412aa2349b729616df4be4dfc3",
+    "sha1": "ee34446d4e4c90a2e53e558483c0d6b39954816b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ff9cd97499db7659134fc3f9c3eede631ffcf43b"
+    "sha2": "513d4b6069b8404b6812fefd4b1fe50a359e2a19"
 }
 ,{
     "testCaseDescription": "javascript-function-call-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "ff9cd97499db7659134fc3f9c3eede631ffcf43b",
+    "sha1": "513d4b6069b8404b6812fefd4b1fe50a359e2a19",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "40ae68e40bb296a0fed10ad139a32c0bdd48c91d"
+    "sha2": "24cfea1fcf29c744bcdee7133960304d2f6600b1"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "40ae68e40bb296a0fed10ad139a32c0bdd48c91d",
+    "sha1": "24cfea1fcf29c744bcdee7133960304d2f6600b1",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "97b784a48b8ba2ab17d9fb5e690fdd5e27995053"
+    "sha2": "9fa45abb039a909f3772ae3692e883c771a9c2c8"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "97b784a48b8ba2ab17d9fb5e690fdd5e27995053",
+    "sha1": "9fa45abb039a909f3772ae3692e883c771a9c2c8",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4ab24690a7b34511675eb6c179c5b85a382c7952"
+    "sha2": "653c6afa58dbcb99cf2461a794484c3bec51b4f2"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "function-call.js"
     ],
-    "sha1": "4ab24690a7b34511675eb6c179c5b85a382c7952",
+    "sha1": "653c6afa58dbcb99cf2461a794484c3bec51b4f2",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "35a769b31d29eac1dc0307402e6e2698e71177ac"
+    "sha2": "be23fb7a4bce629a18cc514f4d52b29b54df51de"
 }]
diff --git a/test/corpus/diff-summaries/javascript/function.json b/test/corpus/diff-summaries/javascript/function.json
index e0d0f55e5..46173eb51 100644
--- a/test/corpus/diff-summaries/javascript/function.json
+++ b/test/corpus/diff-summaries/javascript/function.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "9cd120dd3b152d83f8eea69dfe22940d1acbf177",
+    "sha1": "b9309d6be44ac7a7f6512d7be1c95c15acf7662b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "654ce2cc1260f48fb82edbd0cc5926f11c877700"
+    "sha2": "f014e97f30dc62645be7bf09a9dc6570301b1b3b"
 }
 ,{
     "testCaseDescription": "javascript-function-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "654ce2cc1260f48fb82edbd0cc5926f11c877700",
+    "sha1": "f014e97f30dc62645be7bf09a9dc6570301b1b3b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d935758b74f8e47e1475010591b39e545d5ecc7a"
+    "sha2": "1a43e3e89026da6f29414f21c872f38bbbd2b256"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "d935758b74f8e47e1475010591b39e545d5ecc7a",
+    "sha1": "1a43e3e89026da6f29414f21c872f38bbbd2b256",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8c1abbc8823d22df989efd04e0bcc27c2342b00d"
+    "sha2": "5014fc62f14874e7539cb6c4c7e72721c4ae6b3d"
 }
 ,{
     "testCaseDescription": "javascript-function-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "8c1abbc8823d22df989efd04e0bcc27c2342b00d",
+    "sha1": "5014fc62f14874e7539cb6c4c7e72721c4ae6b3d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0dbbe59af8673a1a5d7ef30f3feed1d050360f91"
+    "sha2": "09c34521c67d3748290f7dc79144405e38eec6a0"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "0dbbe59af8673a1a5d7ef30f3feed1d050360f91",
+    "sha1": "09c34521c67d3748290f7dc79144405e38eec6a0",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "aae7da5266e45976f3617b3d9068bbba2b814869"
+    "sha2": "11113919db1c80ba7707db0151d42e390c77c3f6"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "aae7da5266e45976f3617b3d9068bbba2b814869",
+    "sha1": "11113919db1c80ba7707db0151d42e390c77c3f6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "183393122ec9e9b0bc8b67482c0435aec3fa76a6"
+    "sha2": "255cf0aed85319df438a423e426565e14469cbfa"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "function.js"
     ],
-    "sha1": "183393122ec9e9b0bc8b67482c0435aec3fa76a6",
+    "sha1": "255cf0aed85319df438a423e426565e14469cbfa",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f0f1ee84b62e5f9e91523c1e29c3469ab06fefdf"
+    "sha2": "3500642c4fa286fc947fd2f5517b5a85d6b94b05"
 }]
diff --git a/test/corpus/diff-summaries/javascript/generator-function.json b/test/corpus/diff-summaries/javascript/generator-function.json
index 0ca4a41bd..00528ea8b 100644
--- a/test/corpus/diff-summaries/javascript/generator-function.json
+++ b/test/corpus/diff-summaries/javascript/generator-function.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "5190dfa16aab4d1416b5dad47a3f9cc704af1fae",
+    "sha1": "3db46f8a339fc626f9b79ee15b8c9da6217e75f9",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d7eb5084f8ee88c7b9f3657c9c05d72e4329c5c7"
+    "sha2": "5751581fdbac4a72865aec8155c3fe88f2db5c5f"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "d7eb5084f8ee88c7b9f3657c9c05d72e4329c5c7",
+    "sha1": "5751581fdbac4a72865aec8155c3fe88f2db5c5f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9a1ba4ab7ac42607d9eacb0e871763a2bfe06221"
+    "sha2": "ef75137e4d434b632d4bb3b861aeb80a0e4bcfdf"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "9a1ba4ab7ac42607d9eacb0e871763a2bfe06221",
+    "sha1": "ef75137e4d434b632d4bb3b861aeb80a0e4bcfdf",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7ed14c167f2304005ed80d19a4019dfe9b3d9818"
+    "sha2": "090765267fa869e852753ed6b9da07bd85f62315"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "7ed14c167f2304005ed80d19a4019dfe9b3d9818",
+    "sha1": "090765267fa869e852753ed6b9da07bd85f62315",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fd15cd2ea8a79ab44aefbe49e0cefa5d77567210"
+    "sha2": "e0a00ee1201f8707a553f344a5b1bde7817ba9ac"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "fd15cd2ea8a79ab44aefbe49e0cefa5d77567210",
+    "sha1": "e0a00ee1201f8707a553f344a5b1bde7817ba9ac",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f7461e2154cb8c35bd33d73880ac8ce6fed13968"
+    "sha2": "9dbc1fd4413bbe66a9b8b25b677b9b107091d87b"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "f7461e2154cb8c35bd33d73880ac8ce6fed13968",
+    "sha1": "9dbc1fd4413bbe66a9b8b25b677b9b107091d87b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d6e72611d7be249f33d8283e3fd246ba10119a64"
+    "sha2": "daad3180e8c726a66146129cee8e8476914c0582"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "generator-function.js"
     ],
-    "sha1": "d6e72611d7be249f33d8283e3fd246ba10119a64",
+    "sha1": "daad3180e8c726a66146129cee8e8476914c0582",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "dac1b3637553f83bfd1567e914a0236f9b41b9ec"
+    "sha2": "174f9689542288b1a763d4c2827439207233c75f"
 }]
diff --git a/test/corpus/diff-summaries/javascript/identifier.json b/test/corpus/diff-summaries/javascript/identifier.json
index d684cde62..4b7d8e75c 100644
--- a/test/corpus/diff-summaries/javascript/identifier.json
+++ b/test/corpus/diff-summaries/javascript/identifier.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "49074a4800a61fa651152d1ed712c66519fafbeb",
+    "sha1": "c050b089c291af5276b027ed36e76cfbdcb96fe7",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7c6643be086c41a5cd376fbf7b36e2f7d33bc1bf"
+    "sha2": "2a890a019defbe09712462267a27b8996f396876"
 }
 ,{
     "testCaseDescription": "javascript-identifier-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "7c6643be086c41a5cd376fbf7b36e2f7d33bc1bf",
+    "sha1": "2a890a019defbe09712462267a27b8996f396876",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9714f432aec25fb2318e2dab9f9b2a78fc5cb22f"
+    "sha2": "5dbfc2fe23bcf19b29d091c3bb128dec78db83ea"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "9714f432aec25fb2318e2dab9f9b2a78fc5cb22f",
+    "sha1": "5dbfc2fe23bcf19b29d091c3bb128dec78db83ea",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "93fd36c156a2e1bd23e2e5777f4b5b7e7a82c7cb"
+    "sha2": "9c160b694960f1818b2c88d04199768e8ee883a4"
 }
 ,{
     "testCaseDescription": "javascript-identifier-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "93fd36c156a2e1bd23e2e5777f4b5b7e7a82c7cb",
+    "sha1": "9c160b694960f1818b2c88d04199768e8ee883a4",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "cfb79cbb2bcd620edb55c909983e5e631a08c863"
+    "sha2": "36932f49cd024c6871c0990df04b7e998707d51b"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "cfb79cbb2bcd620edb55c909983e5e631a08c863",
+    "sha1": "36932f49cd024c6871c0990df04b7e998707d51b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "106dff12bfb07dc175748db3ce6f8a6ace4a561a"
+    "sha2": "38b384781817b701402103d2fa2980beaa56d66b"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "106dff12bfb07dc175748db3ce6f8a6ace4a561a",
+    "sha1": "38b384781817b701402103d2fa2980beaa56d66b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "947a90cdedee234b01c85052f7bb112fb1e7eae0"
+    "sha2": "8f096e9ca9ffad1dfd0ad05bcbf522e82380c0de"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "identifier.js"
     ],
-    "sha1": "947a90cdedee234b01c85052f7bb112fb1e7eae0",
+    "sha1": "8f096e9ca9ffad1dfd0ad05bcbf522e82380c0de",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d7c66b2feea9aa25c92f9e3005737bcd96679136"
+    "sha2": "e83aa8350a3522929565a1ccb09f131fa5cd0a4b"
 }]
diff --git a/test/corpus/diff-summaries/javascript/if-else.json b/test/corpus/diff-summaries/javascript/if-else.json
index 40a3cd790..1ccd5f3a3 100644
--- a/test/corpus/diff-summaries/javascript/if-else.json
+++ b/test/corpus/diff-summaries/javascript/if-else.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "3903cb97b8c7fe507a17fa52ec09e6eaa1e95ad8",
+    "sha1": "bf2b590ed40af0da0e712c1305c01a5033aef975",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "182d895f1ed34f6ea3f5e01ebec34f3872486ae2"
+    "sha2": "b4cb951dd2d6779a7330e4b607ecab99d200c117"
 }
 ,{
     "testCaseDescription": "javascript-if-else-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "182d895f1ed34f6ea3f5e01ebec34f3872486ae2",
+    "sha1": "b4cb951dd2d6779a7330e4b607ecab99d200c117",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b27dbe99809ec3a3cff8c1bdac1829a7ec7f3a2a"
+    "sha2": "cbdcb67cad70f10c57b481355df285b963116101"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-insert-test",
@@ -336,9 +336,9 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "b27dbe99809ec3a3cff8c1bdac1829a7ec7f3a2a",
+    "sha1": "cbdcb67cad70f10c57b481355df285b963116101",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2713de071b224835fcb35bf709342334422c4fb7"
+    "sha2": "512d5e38ec7fdcdda480b1bb7ac3bcd076ecc40e"
 }
 ,{
     "testCaseDescription": "javascript-if-else-replacement-test",
@@ -601,9 +601,9 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "2713de071b224835fcb35bf709342334422c4fb7",
+    "sha1": "512d5e38ec7fdcdda480b1bb7ac3bcd076ecc40e",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "acdc250e3e92d45007edc022e7a46bd7c8870264"
+    "sha2": "8453d50fe1916af5c83377956f1f34d0c1e8ef55"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-replacement-test",
@@ -662,9 +662,9 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "acdc250e3e92d45007edc022e7a46bd7c8870264",
+    "sha1": "8453d50fe1916af5c83377956f1f34d0c1e8ef55",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c05504705f6307d70ec027ce0da03266c41b4333"
+    "sha2": "3e7928db0f3bf38da510c512dc038571a9ed240c"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-test",
@@ -693,9 +693,9 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "c05504705f6307d70ec027ce0da03266c41b4333",
+    "sha1": "3e7928db0f3bf38da510c512dc038571a9ed240c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "dbba6da8532f1191731609e596468ea525643576"
+    "sha2": "1a96c8cfc762dfc0b68f4299a91421d043044a1b"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-rest-test",
@@ -724,7 +724,7 @@
     "filePaths": [
         "if-else.js"
     ],
-    "sha1": "dbba6da8532f1191731609e596468ea525643576",
+    "sha1": "1a96c8cfc762dfc0b68f4299a91421d043044a1b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4c75eac553b89390d3a122886e4797b7e470dc3f"
+    "sha2": "ca8fc61f30b2437915b4089b9317d8e0f85cd279"
 }]
diff --git a/test/corpus/diff-summaries/javascript/if.json b/test/corpus/diff-summaries/javascript/if.json
index ace3329dc..332928171 100644
--- a/test/corpus/diff-summaries/javascript/if.json
+++ b/test/corpus/diff-summaries/javascript/if.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "12025ea457b9f71f1c34d8354dcfef593fccd770",
+    "sha1": "8d7246737a7f400cc474f26531961d9c2edfc1be",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "be1ba1d9246e11b23be78baf2717476ab716b9bf"
+    "sha2": "e3a2582f50181977c2e5900c488226a1348a9af0"
 }
 ,{
     "testCaseDescription": "javascript-if-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "be1ba1d9246e11b23be78baf2717476ab716b9bf",
+    "sha1": "e3a2582f50181977c2e5900c488226a1348a9af0",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c01e982383545a2a238b3a6af70f2c1268e473d6"
+    "sha2": "dd8d69b8af230b357fc9400f958dd60413ea48c3"
 }
 ,{
     "testCaseDescription": "javascript-if-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "c01e982383545a2a238b3a6af70f2c1268e473d6",
+    "sha1": "dd8d69b8af230b357fc9400f958dd60413ea48c3",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6040b05311f729269cebedf1d54c8038788faf89"
+    "sha2": "28cdba0dafbd143c73890c7f3ac83b150f2ddec9"
 }
 ,{
     "testCaseDescription": "javascript-if-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "6040b05311f729269cebedf1d54c8038788faf89",
+    "sha1": "28cdba0dafbd143c73890c7f3ac83b150f2ddec9",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ea9839117fdd5a20b5a49fd5bec5b0edf373e914"
+    "sha2": "1eff2acf41c7673a589728e1a7f67d33ab3b0b2e"
 }
 ,{
     "testCaseDescription": "javascript-if-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "ea9839117fdd5a20b5a49fd5bec5b0edf373e914",
+    "sha1": "1eff2acf41c7673a589728e1a7f67d33ab3b0b2e",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "450d9d28a46d3283979a55c31dcf4cd7fadd979b"
+    "sha2": "ddde5559be9c69f58efb20c0dab2379e76b2b944"
 }
 ,{
     "testCaseDescription": "javascript-if-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "450d9d28a46d3283979a55c31dcf4cd7fadd979b",
+    "sha1": "ddde5559be9c69f58efb20c0dab2379e76b2b944",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d96611306db475c3b49c4e6f7c2ac07fedee9c42"
+    "sha2": "73d95c5a132194a04e42e365116650ece7e616b9"
 }
 ,{
     "testCaseDescription": "javascript-if-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "if.js"
     ],
-    "sha1": "d96611306db475c3b49c4e6f7c2ac07fedee9c42",
+    "sha1": "73d95c5a132194a04e42e365116650ece7e616b9",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0e12557e9a116aa82c320e964f67655fe82a8476"
+    "sha2": "3005317217e3ec78b061718564e5910e38843d5c"
 }]
diff --git a/test/corpus/diff-summaries/javascript/import.json b/test/corpus/diff-summaries/javascript/import.json
index 263d2f44f..cb4c8a9fd 100644
--- a/test/corpus/diff-summaries/javascript/import.json
+++ b/test/corpus/diff-summaries/javascript/import.json
@@ -130,9 +130,9 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "969de35a1ab58e78a2a3d5cead43f25486fa0969",
+    "sha1": "cac09a18ecd71b43948019911497d73b36d5fb38",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e4961fa1bc48e9aa157a172e22fca0b5daa58610"
+    "sha2": "7a255c5674a94beedd27043f8b2999f24129c3d1"
 }
 ,{
     "testCaseDescription": "javascript-import-replacement-insert-test",
@@ -386,9 +386,9 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "e4961fa1bc48e9aa157a172e22fca0b5daa58610",
+    "sha1": "7a255c5674a94beedd27043f8b2999f24129c3d1",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "79337911d1d279db1c8f7e5c804ae138a9828ad6"
+    "sha2": "7da58d7af4db5a7f625d3941a35094aebaa6fab5"
 }
 ,{
     "testCaseDescription": "javascript-import-delete-insert-test",
@@ -915,9 +915,9 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "79337911d1d279db1c8f7e5c804ae138a9828ad6",
+    "sha1": "7da58d7af4db5a7f625d3941a35094aebaa6fab5",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8d4527bce8c95528790ff0069721625d57d52453"
+    "sha2": "3360b4e2a79da60cd404db27520862368b5ccf66"
 }
 ,{
     "testCaseDescription": "javascript-import-replacement-test",
@@ -1444,9 +1444,9 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "8d4527bce8c95528790ff0069721625d57d52453",
+    "sha1": "3360b4e2a79da60cd404db27520862368b5ccf66",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "94fc50c3a96433235f388106a83e12feb3f0dbc5"
+    "sha2": "08214146b5b57e52e797e7977fbcfc8c2f2acd6f"
 }
 ,{
     "testCaseDescription": "javascript-import-delete-replacement-test",
@@ -1820,9 +1820,9 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "94fc50c3a96433235f388106a83e12feb3f0dbc5",
+    "sha1": "08214146b5b57e52e797e7977fbcfc8c2f2acd6f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c6e16f8e22f889194b05370d047adee0492b212a"
+    "sha2": "e462942a5f318660d56d311ceb5a0e1c9d6850b1"
 }
 ,{
     "testCaseDescription": "javascript-import-delete-test",
@@ -1956,9 +1956,9 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "c6e16f8e22f889194b05370d047adee0492b212a",
+    "sha1": "e462942a5f318660d56d311ceb5a0e1c9d6850b1",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e7da09a2fb206c5b2bbe8c80573730f7c36005a6"
+    "sha2": "1e79d2b96777685f1ae0e7f9724439aae850cc5f"
 }
 ,{
     "testCaseDescription": "javascript-import-delete-rest-test",
@@ -2092,7 +2092,7 @@
     "filePaths": [
         "import.js"
     ],
-    "sha1": "e7da09a2fb206c5b2bbe8c80573730f7c36005a6",
+    "sha1": "1e79d2b96777685f1ae0e7f9724439aae850cc5f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5fe7b16cba1bd7450b16782afa1d3798fbb6f31c"
+    "sha2": "69f9b449dfd4e7e791586a52b66907259414e444"
 }]
diff --git a/test/corpus/diff-summaries/javascript/math-assignment-operator.json b/test/corpus/diff-summaries/javascript/math-assignment-operator.json
index aa8bff563..f587aa433 100644
--- a/test/corpus/diff-summaries/javascript/math-assignment-operator.json
+++ b/test/corpus/diff-summaries/javascript/math-assignment-operator.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "20c9fcd2968854089edd9800a50d5c4a92d8e07b",
+    "sha1": "9fdb6d41940e4cddffa1594cb21193786e513dcd",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "44a0ac752ed04f0db713416a4b71465fcb6791e5"
+    "sha2": "0cbdbdb19e893c90a281f8021464901a7a9c48a6"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "44a0ac752ed04f0db713416a4b71465fcb6791e5",
+    "sha1": "0cbdbdb19e893c90a281f8021464901a7a9c48a6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9186895045b5796889b609b6804f3ca92d100c37"
+    "sha2": "399add9951bfc4f60843c765f5b06bbf8c053b15"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "9186895045b5796889b609b6804f3ca92d100c37",
+    "sha1": "399add9951bfc4f60843c765f5b06bbf8c053b15",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "708ef787fa29646989c2a62e3a38224c6e54150a"
+    "sha2": "7c55909ac09d2ad4b0b309cb8b777e27fca5a371"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "708ef787fa29646989c2a62e3a38224c6e54150a",
+    "sha1": "7c55909ac09d2ad4b0b309cb8b777e27fca5a371",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "dba9d03bc3f05c75c64261dc7980015b55215097"
+    "sha2": "c0f2848f8961b192415e55ba3b6ce2c6fd73f5b1"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "dba9d03bc3f05c75c64261dc7980015b55215097",
+    "sha1": "c0f2848f8961b192415e55ba3b6ce2c6fd73f5b1",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4b9bb90264994d44abe5f4178554cbc9364b3fac"
+    "sha2": "838632b8f1a9dcda315df6a274732de24f25e064"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "4b9bb90264994d44abe5f4178554cbc9364b3fac",
+    "sha1": "838632b8f1a9dcda315df6a274732de24f25e064",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c6ca546f3e99646514f92e89805309dc8ee3a519"
+    "sha2": "bbdd19d88c1b667faabc80d61f86bbb0c1856eec"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "math-assignment-operator.js"
     ],
-    "sha1": "c6ca546f3e99646514f92e89805309dc8ee3a519",
+    "sha1": "bbdd19d88c1b667faabc80d61f86bbb0c1856eec",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "296397df0f0e65c6e8ab7e4962469076b890cd66"
+    "sha2": "c2c1eee66eb40ab58a90d2eeb6bec278fbfbc4d8"
 }]
diff --git a/test/corpus/diff-summaries/javascript/math-operator.json b/test/corpus/diff-summaries/javascript/math-operator.json
index 5aae78353..5df9718ab 100644
--- a/test/corpus/diff-summaries/javascript/math-operator.json
+++ b/test/corpus/diff-summaries/javascript/math-operator.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "94851cf65efff14a5d6caad6c5ec3055d75f6891",
+    "sha1": "525c410ecf4e93a1e2a4458048ac8ad20f94b106",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5154551d7bb3028e34b78c57ef6e8251941c5e24"
+    "sha2": "2224c08ad1a8c458c28dfe1adf50020de4ff8d11"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "5154551d7bb3028e34b78c57ef6e8251941c5e24",
+    "sha1": "2224c08ad1a8c458c28dfe1adf50020de4ff8d11",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fc5286a2ab8fbc26558fc824e1673af4c9444af0"
+    "sha2": "39bf515c5d70188ed5c1af1659f8f46c8b29cbf4"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-delete-insert-test",
@@ -141,9 +141,9 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "fc5286a2ab8fbc26558fc824e1673af4c9444af0",
+    "sha1": "39bf515c5d70188ed5c1af1659f8f46c8b29cbf4",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "20ff08f05738054ae97a55afe187f062018e7b4a"
+    "sha2": "e9f0a4da7f5ac91ab96c81686c91bcac74d3db73"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-replacement-test",
@@ -211,9 +211,9 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "20ff08f05738054ae97a55afe187f062018e7b4a",
+    "sha1": "e9f0a4da7f5ac91ab96c81686c91bcac74d3db73",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b633411825d8d0d6e48285da3ac8a127bb5b833f"
+    "sha2": "46a18c0e28d591d0e909510c820f4bbce36c68c5"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-delete-replacement-test",
@@ -272,9 +272,9 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "b633411825d8d0d6e48285da3ac8a127bb5b833f",
+    "sha1": "46a18c0e28d591d0e909510c820f4bbce36c68c5",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5fba7f8da7725787273fb9fdff3650ee0572bfcd"
+    "sha2": "805eaa3b4a99ca8781f9913d2da30105a810581e"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-delete-test",
@@ -303,9 +303,9 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "5fba7f8da7725787273fb9fdff3650ee0572bfcd",
+    "sha1": "805eaa3b4a99ca8781f9913d2da30105a810581e",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "971b37d42e25cdfa61a5023a7fbbef5321f2848a"
+    "sha2": "dcfc4060871b8f119034866ad45dfef8a795c0b0"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-delete-rest-test",
@@ -334,7 +334,7 @@
     "filePaths": [
         "math-operator.js"
     ],
-    "sha1": "971b37d42e25cdfa61a5023a7fbbef5321f2848a",
+    "sha1": "dcfc4060871b8f119034866ad45dfef8a795c0b0",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "86115e374d32bc9d7b6c8dd347d7ec900b501880"
+    "sha2": "8483a9d6002f107db08fef4c3389e0f5a2234617"
 }]
diff --git a/test/corpus/diff-summaries/javascript/member-access-assignment.json b/test/corpus/diff-summaries/javascript/member-access-assignment.json
index b46603dac..114c47bf3 100644
--- a/test/corpus/diff-summaries/javascript/member-access-assignment.json
+++ b/test/corpus/diff-summaries/javascript/member-access-assignment.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "372f806f1ac14eeaef4f8dd5ae1f081823efe483",
+    "sha1": "6d65eab1abeb779d444ecaa1f97fe4002605a0de",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a1055cc31a158a5fa654aa40427592b3d6b10c88"
+    "sha2": "69b316a32abc43ae01227e11fdeddb65fdadbb09"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "a1055cc31a158a5fa654aa40427592b3d6b10c88",
+    "sha1": "69b316a32abc43ae01227e11fdeddb65fdadbb09",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "639b924cdb7df8d54c5accd88915cc8843556868"
+    "sha2": "ddd867c744e492684052a333b7dd65e0e4bd2901"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "639b924cdb7df8d54c5accd88915cc8843556868",
+    "sha1": "ddd867c744e492684052a333b7dd65e0e4bd2901",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "21f1f660aaa494d71f21feebf996dee749004e74"
+    "sha2": "3837347245e0ff5c3b4b0a7599c21c4e45b507c0"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "21f1f660aaa494d71f21feebf996dee749004e74",
+    "sha1": "3837347245e0ff5c3b4b0a7599c21c4e45b507c0",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "62c47a061654573bb752aae3bd9ef9bcceaddf20"
+    "sha2": "1251110b97862a7aacb35be25ae335d3817ebc07"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "62c47a061654573bb752aae3bd9ef9bcceaddf20",
+    "sha1": "1251110b97862a7aacb35be25ae335d3817ebc07",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "19c82c7fd6b8e019cf970ad495af8c0998610f6f"
+    "sha2": "a92281f7281d6208ad099bd4f5aa08bac12ba14a"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "19c82c7fd6b8e019cf970ad495af8c0998610f6f",
+    "sha1": "a92281f7281d6208ad099bd4f5aa08bac12ba14a",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c87076b2cfb63f72f222f023fe8aa0d28927632a"
+    "sha2": "ff1d9083efd08c941ab6770c4947484746b4cc4d"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "member-access-assignment.js"
     ],
-    "sha1": "c87076b2cfb63f72f222f023fe8aa0d28927632a",
+    "sha1": "ff1d9083efd08c941ab6770c4947484746b4cc4d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9ca89bc6c9066b34bc18aecce4f646208c65c907"
+    "sha2": "65749aaab101289cec92c967724cc15fbf645941"
 }]
diff --git a/test/corpus/diff-summaries/javascript/member-access.json b/test/corpus/diff-summaries/javascript/member-access.json
index 4839d85b4..452a4ec46 100644
--- a/test/corpus/diff-summaries/javascript/member-access.json
+++ b/test/corpus/diff-summaries/javascript/member-access.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "8c89ac29c02f4714dc946e2824152d320b623e36",
+    "sha1": "ea81ca1c07a6faf3f0618249d2a09412fd45f454",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7819fe045b5f19ee470b8f0d2371d9344f6c183a"
+    "sha2": "6c47cbaf31e610ca2df86286a134a707a061dd25"
 }
 ,{
     "testCaseDescription": "javascript-member-access-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "7819fe045b5f19ee470b8f0d2371d9344f6c183a",
+    "sha1": "6c47cbaf31e610ca2df86286a134a707a061dd25",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "823d52271b2d99c48216948e20cec0ba6b9d1e6e"
+    "sha2": "9d1e09833efe3bfbf245db33ba2a16be7750f0a4"
 }
 ,{
     "testCaseDescription": "javascript-member-access-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "823d52271b2d99c48216948e20cec0ba6b9d1e6e",
+    "sha1": "9d1e09833efe3bfbf245db33ba2a16be7750f0a4",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "dd0030c04fcaf1e5784706aee9760bd9904495b8"
+    "sha2": "6b65f5a35ebb4138faa8f51b21fdda9f6d1f6170"
 }
 ,{
     "testCaseDescription": "javascript-member-access-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "dd0030c04fcaf1e5784706aee9760bd9904495b8",
+    "sha1": "6b65f5a35ebb4138faa8f51b21fdda9f6d1f6170",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "88e2ad3ffa0cca807aeb6e2ea97562c04034a954"
+    "sha2": "7da531ca63b468418e4f5f97c15075affdc1b992"
 }
 ,{
     "testCaseDescription": "javascript-member-access-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "88e2ad3ffa0cca807aeb6e2ea97562c04034a954",
+    "sha1": "7da531ca63b468418e4f5f97c15075affdc1b992",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2aaeaae2047b4dea6cb7f6a0851e0314b682b856"
+    "sha2": "1eac5af2f4d6c9467db175f0d78388e71db9cba2"
 }
 ,{
     "testCaseDescription": "javascript-member-access-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "2aaeaae2047b4dea6cb7f6a0851e0314b682b856",
+    "sha1": "1eac5af2f4d6c9467db175f0d78388e71db9cba2",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5ee7c25fc11122ae36f4a585fafbe0d0f69ed1b9"
+    "sha2": "a177945c88a672027f5deffa3566db6873602c96"
 }
 ,{
     "testCaseDescription": "javascript-member-access-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "member-access.js"
     ],
-    "sha1": "5ee7c25fc11122ae36f4a585fafbe0d0f69ed1b9",
+    "sha1": "a177945c88a672027f5deffa3566db6873602c96",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b5aeb51a21b78d1547cc65d09bad74c4e27f68c6"
+    "sha2": "059567d215e970057a786670ec029bfcc34477f1"
 }]
diff --git a/test/corpus/diff-summaries/javascript/method-call.json b/test/corpus/diff-summaries/javascript/method-call.json
index 6c6ad789e..4c8434a2a 100644
--- a/test/corpus/diff-summaries/javascript/method-call.json
+++ b/test/corpus/diff-summaries/javascript/method-call.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "a37267842ee6f1e161c4316af0cb35f4b632a059",
+    "sha1": "5a8efbb9dca06da8693630889143a26cad117383",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "609913d4f6d79ee00e3d411b2e3915071ad635f5"
+    "sha2": "b45afef16c8c5194b7441f66054cec554580bb36"
 }
 ,{
     "testCaseDescription": "javascript-method-call-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "609913d4f6d79ee00e3d411b2e3915071ad635f5",
+    "sha1": "b45afef16c8c5194b7441f66054cec554580bb36",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "33a0c4183dd058b371cce8b43c01dc788edd30f2"
+    "sha2": "5632eea1b3c75672875b2da790be6ceb8ea60ab7"
 }
 ,{
     "testCaseDescription": "javascript-method-call-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "33a0c4183dd058b371cce8b43c01dc788edd30f2",
+    "sha1": "5632eea1b3c75672875b2da790be6ceb8ea60ab7",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b350dc1500aa52926e6cd6fedc4e04375a2f3828"
+    "sha2": "3d5dd3a55b0d69ceb90d588cc4bb8db882f025c9"
 }
 ,{
     "testCaseDescription": "javascript-method-call-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "b350dc1500aa52926e6cd6fedc4e04375a2f3828",
+    "sha1": "3d5dd3a55b0d69ceb90d588cc4bb8db882f025c9",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ee87a9ae5d5c4a2518eb5f7ef0b26bd9b0a371e6"
+    "sha2": "a3e9f040b60c71c179d8ecf139d9c4e82abd13d8"
 }
 ,{
     "testCaseDescription": "javascript-method-call-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "ee87a9ae5d5c4a2518eb5f7ef0b26bd9b0a371e6",
+    "sha1": "a3e9f040b60c71c179d8ecf139d9c4e82abd13d8",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "794adc95ac0d89beca54fc417b94eaf5ac50ec58"
+    "sha2": "09254971b46f06843769e224379df898358ab8bc"
 }
 ,{
     "testCaseDescription": "javascript-method-call-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "794adc95ac0d89beca54fc417b94eaf5ac50ec58",
+    "sha1": "09254971b46f06843769e224379df898358ab8bc",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "db28776718addccb53343bee695b484d8a389784"
+    "sha2": "1e60659500dc23086f482384e63387c48fe6fe80"
 }
 ,{
     "testCaseDescription": "javascript-method-call-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "method-call.js"
     ],
-    "sha1": "db28776718addccb53343bee695b484d8a389784",
+    "sha1": "1e60659500dc23086f482384e63387c48fe6fe80",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7b45d5b720f557df4fbd880be8c0e292c4defdc4"
+    "sha2": "8644f5670ed26d725ad181657c3df394f4e03469"
 }]
diff --git a/test/corpus/diff-summaries/javascript/named-function.json b/test/corpus/diff-summaries/javascript/named-function.json
index 235f6a373..205a79fba 100644
--- a/test/corpus/diff-summaries/javascript/named-function.json
+++ b/test/corpus/diff-summaries/javascript/named-function.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "named-function.js"
     ],
-    "sha1": "caeacf57ee751440e4f9b9f606df460c17499bdd",
+    "sha1": "6444dae570de13bc1629da54e6c2ed6e3f462c3f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "742ee12fc034748905977d3e1ba7818df34b9b66"
+    "sha2": "f2102528af4babb26589d0214c1aca857708a473"
 }
 ,{
     "testCaseDescription": "javascript-named-function-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "named-function.js"
     ],
-    "sha1": "742ee12fc034748905977d3e1ba7818df34b9b66",
+    "sha1": "f2102528af4babb26589d0214c1aca857708a473",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "05f7b98428d31fa7ae97f65b6c901b8b392764f7"
+    "sha2": "aef2a75e801a46a47d26dee2a64d8e3cc388d29d"
 }
 ,{
     "testCaseDescription": "javascript-named-function-delete-insert-test",
@@ -174,9 +174,9 @@
     "filePaths": [
         "named-function.js"
     ],
-    "sha1": "05f7b98428d31fa7ae97f65b6c901b8b392764f7",
+    "sha1": "aef2a75e801a46a47d26dee2a64d8e3cc388d29d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e60e4118dca7f21ef5d06d668e6f6961f94ece60"
+    "sha2": "1626bcdad5ee5fbc815cbe7fdf11a5ab7c2f988c"
 }
 ,{
     "testCaseDescription": "javascript-named-function-replacement-test",
@@ -277,9 +277,9 @@
     "filePaths": [
         "named-function.js"
     ],
-    "sha1": "e60e4118dca7f21ef5d06d668e6f6961f94ece60",
+    "sha1": "1626bcdad5ee5fbc815cbe7fdf11a5ab7c2f988c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0d662b70bd31f4c7a957db6e3c874f0e117d81ec"
+    "sha2": "0680286db22fa318ff52d171118b4e0b864fa1f5"
 }
 ,{
     "testCaseDescription": "javascript-named-function-delete-replacement-test",
@@ -338,9 +338,9 @@
     "filePaths": [
         "named-function.js"
     ],
-    "sha1": "0d662b70bd31f4c7a957db6e3c874f0e117d81ec",
+    "sha1": "0680286db22fa318ff52d171118b4e0b864fa1f5",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2751fd48810beeaf43dbb897d5687e7bb4605ee8"
+    "sha2": "16edcb1f93464ed73eda6f5a2b42ee984de42fd4"
 }
 ,{
     "testCaseDescription": "javascript-named-function-delete-test",
@@ -369,9 +369,9 @@
     "filePaths": [
         "named-function.js"
     ],
-    "sha1": "2751fd48810beeaf43dbb897d5687e7bb4605ee8",
+    "sha1": "16edcb1f93464ed73eda6f5a2b42ee984de42fd4",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "71fbb6e60978e220e6e2f91e426df58fc0fd8317"
+    "sha2": "711c2435d6e5d72a6db3f917c39da59bb8b9d01f"
 }
 ,{
     "testCaseDescription": "javascript-named-function-delete-rest-test",
@@ -400,7 +400,7 @@
     "filePaths": [
         "named-function.js"
     ],
-    "sha1": "71fbb6e60978e220e6e2f91e426df58fc0fd8317",
+    "sha1": "711c2435d6e5d72a6db3f917c39da59bb8b9d01f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "224d24020b3b8d08a8f3aced4b83b49a5779ba41"
+    "sha2": "e781167810dcb6620adcc80d334da3d9a094cab7"
 }]
diff --git a/test/corpus/diff-summaries/javascript/nested-do-while-in-function.json b/test/corpus/diff-summaries/javascript/nested-do-while-in-function.json
index aaacc9ba6..974dad2a6 100644
--- a/test/corpus/diff-summaries/javascript/nested-do-while-in-function.json
+++ b/test/corpus/diff-summaries/javascript/nested-do-while-in-function.json
@@ -16,7 +16,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1, name2, name3, nameN export statement"
+                    "summary": "Added the { name1, name2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -31,7 +31,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the variable1 as name1, variable2 as name2, nameN export statement"
+                    "summary": "Added the { variable1 as name1, variable2 as name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -46,7 +46,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1, name2, nameN export statement"
+                    "summary": "Added the { name1, name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -61,7 +61,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1 = value1, name2 = value2, name3, nameN export statement"
+                    "summary": "Added the { name1 = value1, name2 = value2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -76,7 +76,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the namedFunction export statement"
+                    "summary": "Added the { namedFunction } export statement"
                 },
                 {
                     "span": {
@@ -91,7 +91,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the anonymous() function export statement"
+                    "summary": "Added the { anonymous() } export statement"
                 },
                 {
                     "span": {
@@ -106,7 +106,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1 export statement"
+                    "summary": "Added the { name1 } export statement"
                 },
                 {
                     "span": {
@@ -121,7 +121,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1 as default export statement"
+                    "summary": "Added the { name1 as default } export statement"
                 },
                 {
                     "span": {
@@ -136,7 +136,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'foo' export statement"
+                    "summary": "Added the { 'foo' } export statement"
                 },
                 {
                     "span": {
@@ -151,7 +151,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1, name2, nameN from 'foo' export statement"
+                    "summary": "Added the { name1, name2, nameN } from 'foo' export statement"
                 },
                 {
                     "span": {
@@ -166,7 +166,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the import1 as name1, import2 as name2, nameN from 'bar' export statement"
+                    "summary": "Added the { import1 as name1, import2 as name2, nameN } from 'bar' export statement"
                 }
             ]
         },
@@ -175,9 +175,9 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "325e137487dbe6b99e8736817eaf2d7b25572dc8",
+    "sha1": "8246c91c796c7b80e7e802c79cc50839770f804f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5cc80139b82de7b04677ae393b72bfb45d5c2a15"
+    "sha2": "4ca4e64487f26fb02bfe01cd0f70f38cb4ab94b2"
 }
 ,{
     "testCaseDescription": "javascript-export-replacement-insert-test",
@@ -197,7 +197,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name4, name5, name6, nameZ export statement"
+                    "summary": "Added the { name4, name5, name6, nameZ } export statement"
                 },
                 {
                     "span": {
@@ -212,7 +212,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the variable2 as name2, variable3 as name3, nameY export statement"
+                    "summary": "Added the { variable2 as name2, variable3 as name3, nameY } export statement"
                 },
                 {
                     "span": {
@@ -227,7 +227,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name3, name4, nameT export statement"
+                    "summary": "Added the { name3, name4, nameT } export statement"
                 },
                 {
                     "span": {
@@ -242,7 +242,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name2 = value2, name3 = value3, name4, nameO export statement"
+                    "summary": "Added the { name2 = value2, name3 = value3, name4, nameO } export statement"
                 },
                 {
                     "span": {
@@ -257,7 +257,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the otherNamedFunction export statement"
+                    "summary": "Added the { otherNamedFunction } export statement"
                 },
                 {
                     "span": {
@@ -272,7 +272,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the newName1 export statement"
+                    "summary": "Added the { newName1 } export statement"
                 },
                 {
                     "span": {
@@ -287,7 +287,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the anonymous() function export statement"
+                    "summary": "Added the { anonymous() } export statement"
                 },
                 {
                     "span": {
@@ -302,7 +302,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name2 as statement export statement"
+                    "summary": "Added the { name2 as statement } export statement"
                 },
                 {
                     "span": {
@@ -317,7 +317,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'baz' export statement"
+                    "summary": "Added the { 'baz' } export statement"
                 },
                 {
                     "span": {
@@ -332,7 +332,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name7, name8, nameP from 'buzz' export statement"
+                    "summary": "Added the { name7, name8, nameP } from 'buzz' export statement"
                 },
                 {
                     "span": {
@@ -347,7 +347,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the import6 as name6, import7 as name7, nameB from 'fizz' export statement"
+                    "summary": "Added the { import6 as name6, import7 as name7, nameB } from 'fizz' export statement"
                 },
                 {
                     "span": {
@@ -362,7 +362,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1, name2, name3, nameN export statement"
+                    "summary": "Added the { name1, name2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -377,7 +377,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the variable1 as name1, variable2 as name2, nameN export statement"
+                    "summary": "Added the { variable1 as name1, variable2 as name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -392,7 +392,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1, name2, nameN export statement"
+                    "summary": "Added the { name1, name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -407,7 +407,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1 = value1, name2 = value2, name3, nameN export statement"
+                    "summary": "Added the { name1 = value1, name2 = value2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -422,7 +422,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the namedFunction export statement"
+                    "summary": "Added the { namedFunction } export statement"
                 },
                 {
                     "span": {
@@ -437,7 +437,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the anonymous() function export statement"
+                    "summary": "Added the { anonymous() } export statement"
                 },
                 {
                     "span": {
@@ -452,7 +452,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1 export statement"
+                    "summary": "Added the { name1 } export statement"
                 },
                 {
                     "span": {
@@ -467,7 +467,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1 as default export statement"
+                    "summary": "Added the { name1 as default } export statement"
                 },
                 {
                     "span": {
@@ -482,7 +482,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'foo' export statement"
+                    "summary": "Added the { 'foo' } export statement"
                 },
                 {
                     "span": {
@@ -497,7 +497,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1, name2, nameN from 'foo' export statement"
+                    "summary": "Added the { name1, name2, nameN } from 'foo' export statement"
                 },
                 {
                     "span": {
@@ -512,7 +512,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the import1 as name1, import2 as name2, nameN from 'bar' export statement"
+                    "summary": "Added the { import1 as name1, import2 as name2, nameN } from 'bar' export statement"
                 }
             ]
         },
@@ -521,9 +521,9 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "5cc80139b82de7b04677ae393b72bfb45d5c2a15",
+    "sha1": "4ca4e64487f26fb02bfe01cd0f70f38cb4ab94b2",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4a8a60bc1bf98a633b4c92368a075c7990b983d7"
+    "sha2": "a03bd706692a84c440328b6954aa2345652f6b84"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-insert-test",
@@ -555,7 +555,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'name4' identifier with the 'name1' identifier in the name1, name2, name3, nameN export statement"
+                    "summary": "Replaced the 'name4' identifier with the 'name1' identifier in the { name1, name2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -582,7 +582,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'name5' identifier with the 'name2' identifier in the name1, name2, name3, nameN export statement"
+                    "summary": "Replaced the 'name5' identifier with the 'name2' identifier in the { name1, name2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -609,7 +609,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'name6' identifier with the 'name3' identifier in the name1, name2, name3, nameN export statement"
+                    "summary": "Replaced the 'name6' identifier with the 'name3' identifier in the { name1, name2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -636,7 +636,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'nameZ' identifier with the 'nameN' identifier in the name1, name2, name3, nameN export statement"
+                    "summary": "Replaced the 'nameZ' identifier with the 'nameN' identifier in the { name1, name2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -663,7 +663,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'variable2' identifier with the 'variable1' identifier in the variable1 as name1, variable2 as name2, nameN export statement"
+                    "summary": "Replaced the 'variable2' identifier with the 'variable1' identifier in the { variable1 as name1, variable2 as name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -690,7 +690,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'name2' identifier with the 'name1' identifier in the variable1 as name1, variable2 as name2, nameN export statement"
+                    "summary": "Replaced the 'name2' identifier with the 'name1' identifier in the { variable1 as name1, variable2 as name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -717,7 +717,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'variable3' identifier with the 'variable2' identifier in the variable1 as name1, variable2 as name2, nameN export statement"
+                    "summary": "Replaced the 'variable3' identifier with the 'variable2' identifier in the { variable1 as name1, variable2 as name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -744,7 +744,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'name3' identifier with the 'name2' identifier in the variable1 as name1, variable2 as name2, nameN export statement"
+                    "summary": "Replaced the 'name3' identifier with the 'name2' identifier in the { variable1 as name1, variable2 as name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -771,7 +771,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'nameY' identifier with the 'nameN' identifier in the variable1 as name1, variable2 as name2, nameN export statement"
+                    "summary": "Replaced the 'nameY' identifier with the 'nameN' identifier in the { variable1 as name1, variable2 as name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -798,7 +798,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'name3' identifier with the 'name1' identifier in the name1, name2, nameN export statement"
+                    "summary": "Replaced the 'name3' identifier with the 'name1' identifier in the { name1, name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -825,7 +825,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'name4' identifier with the 'name2' identifier in the name1, name2, nameN export statement"
+                    "summary": "Replaced the 'name4' identifier with the 'name2' identifier in the { name1, name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -852,7 +852,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'nameT' identifier with the 'nameN' identifier in the name1, name2, nameN export statement"
+                    "summary": "Replaced the 'nameT' identifier with the 'nameN' identifier in the { name1, name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -987,7 +987,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'name4' identifier with the 'name3' identifier in the name1 = value1, name2 = value2, name3, nameN export statement"
+                    "summary": "Replaced the 'name4' identifier with the 'name3' identifier in the { name1 = value1, name2 = value2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -1014,7 +1014,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'nameO' identifier with the 'nameN' identifier in the name1 = value1, name2 = value2, name3, nameN export statement"
+                    "summary": "Replaced the 'nameO' identifier with the 'nameN' identifier in the { name1 = value1, name2 = value2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -1041,7 +1041,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'otherNamedFunction' identifier with the 'namedFunction' identifier in the namedFunction export statement"
+                    "summary": "Replaced the 'otherNamedFunction' identifier with the 'namedFunction' identifier in the { namedFunction } export statement"
                 },
                 {
                     "span": {
@@ -1056,7 +1056,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the anonymous() function export statement"
+                    "summary": "Added the { anonymous() } export statement"
                 },
                 {
                     "span": {
@@ -1071,7 +1071,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1 export statement"
+                    "summary": "Added the { name1 } export statement"
                 },
                 {
                     "span": {
@@ -1086,7 +1086,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1 as default export statement"
+                    "summary": "Added the { name1 as default } export statement"
                 },
                 {
                     "span": {
@@ -1101,7 +1101,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'foo' export statement"
+                    "summary": "Added the { 'foo' } export statement"
                 },
                 {
                     "span": {
@@ -1116,7 +1116,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name1, name2, nameN from 'foo' export statement"
+                    "summary": "Added the { name1, name2, nameN } from 'foo' export statement"
                 },
                 {
                     "span": {
@@ -1131,7 +1131,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the import1 as name1, import2 as name2, nameN from 'bar' export statement"
+                    "summary": "Added the { import1 as name1, import2 as name2, nameN } from 'bar' export statement"
                 },
                 {
                     "span": {
@@ -1146,7 +1146,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the newName1 export statement"
+                    "summary": "Deleted the { newName1 } export statement"
                 },
                 {
                     "span": {
@@ -1161,7 +1161,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the anonymous() function export statement"
+                    "summary": "Deleted the { anonymous() } export statement"
                 },
                 {
                     "span": {
@@ -1176,7 +1176,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name2 as statement export statement"
+                    "summary": "Deleted the { name2 as statement } export statement"
                 },
                 {
                     "span": {
@@ -1191,7 +1191,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'baz' export statement"
+                    "summary": "Deleted the { 'baz' } export statement"
                 },
                 {
                     "span": {
@@ -1206,7 +1206,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name7, name8, nameP from 'buzz' export statement"
+                    "summary": "Deleted the { name7, name8, nameP } from 'buzz' export statement"
                 },
                 {
                     "span": {
@@ -1221,7 +1221,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the import6 as name6, import7 as name7, nameB from 'fizz' export statement"
+                    "summary": "Deleted the { import6 as name6, import7 as name7, nameB } from 'fizz' export statement"
                 }
             ]
         },
@@ -1230,9 +1230,9 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "4a8a60bc1bf98a633b4c92368a075c7990b983d7",
+    "sha1": "a03bd706692a84c440328b6954aa2345652f6b84",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4ffb72f4091bf1dec741647f5d9e804f0565eea6"
+    "sha2": "14bfef30cb497609690f056b4120a96918884a20"
 }
 ,{
     "testCaseDescription": "javascript-export-replacement-test",
@@ -1264,7 +1264,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'name1' identifier with the 'name4' identifier in the name4, name5, name6, nameZ export statement"
+                    "summary": "Replaced the 'name1' identifier with the 'name4' identifier in the { name4, name5, name6, nameZ } export statement"
                 },
                 {
                     "span": {
@@ -1291,7 +1291,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'name2' identifier with the 'name5' identifier in the name4, name5, name6, nameZ export statement"
+                    "summary": "Replaced the 'name2' identifier with the 'name5' identifier in the { name4, name5, name6, nameZ } export statement"
                 },
                 {
                     "span": {
@@ -1318,7 +1318,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'name3' identifier with the 'name6' identifier in the name4, name5, name6, nameZ export statement"
+                    "summary": "Replaced the 'name3' identifier with the 'name6' identifier in the { name4, name5, name6, nameZ } export statement"
                 },
                 {
                     "span": {
@@ -1345,7 +1345,7 @@
                             }
                         ]
                     },
-                    "summary": "Replaced the 'nameN' identifier with the 'nameZ' identifier in the name4, name5, name6, nameZ export statement"
+                    "summary": "Replaced the 'nameN' identifier with the 'nameZ' identifier in the { name4, name5, name6, nameZ } export statement"
                 },
                 {
                     "span": {
@@ -1360,7 +1360,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the variable2 as name2, variable3 as name3, nameY export statement"
+                    "summary": "Added the { variable2 as name2, variable3 as name3, nameY } export statement"
                 },
                 {
                     "span": {
@@ -1375,7 +1375,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name3, name4, nameT export statement"
+                    "summary": "Added the { name3, name4, nameT } export statement"
                 },
                 {
                     "span": {
@@ -1390,7 +1390,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name2 = value2, name3 = value3, name4, nameO export statement"
+                    "summary": "Added the { name2 = value2, name3 = value3, name4, nameO } export statement"
                 },
                 {
                     "span": {
@@ -1405,7 +1405,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the otherNamedFunction export statement"
+                    "summary": "Added the { otherNamedFunction } export statement"
                 },
                 {
                     "span": {
@@ -1420,7 +1420,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the newName1 export statement"
+                    "summary": "Added the { newName1 } export statement"
                 },
                 {
                     "span": {
@@ -1435,7 +1435,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the anonymous() function export statement"
+                    "summary": "Added the { anonymous() } export statement"
                 },
                 {
                     "span": {
@@ -1450,7 +1450,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name2 as statement export statement"
+                    "summary": "Added the { name2 as statement } export statement"
                 },
                 {
                     "span": {
@@ -1465,7 +1465,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'baz' export statement"
+                    "summary": "Added the { 'baz' } export statement"
                 },
                 {
                     "span": {
@@ -1480,7 +1480,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name7, name8, nameP from 'buzz' export statement"
+                    "summary": "Added the { name7, name8, nameP } from 'buzz' export statement"
                 },
                 {
                     "span": {
@@ -1495,7 +1495,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the import6 as name6, import7 as name7, nameB from 'fizz' export statement"
+                    "summary": "Added the { import6 as name6, import7 as name7, nameB } from 'fizz' export statement"
                 },
                 {
                     "span": {
@@ -1510,7 +1510,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the variable1 as name1, variable2 as name2, nameN export statement"
+                    "summary": "Deleted the { variable1 as name1, variable2 as name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -1525,7 +1525,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1, name2, nameN export statement"
+                    "summary": "Deleted the { name1, name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -1540,7 +1540,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1 = value1, name2 = value2, name3, nameN export statement"
+                    "summary": "Deleted the { name1 = value1, name2 = value2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -1555,7 +1555,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the namedFunction export statement"
+                    "summary": "Deleted the { namedFunction } export statement"
                 },
                 {
                     "span": {
@@ -1570,7 +1570,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the anonymous() function export statement"
+                    "summary": "Deleted the { anonymous() } export statement"
                 },
                 {
                     "span": {
@@ -1585,7 +1585,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1 export statement"
+                    "summary": "Deleted the { name1 } export statement"
                 },
                 {
                     "span": {
@@ -1600,7 +1600,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1 as default export statement"
+                    "summary": "Deleted the { name1 as default } export statement"
                 },
                 {
                     "span": {
@@ -1615,7 +1615,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'foo' export statement"
+                    "summary": "Deleted the { 'foo' } export statement"
                 },
                 {
                     "span": {
@@ -1630,7 +1630,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1, name2, nameN from 'foo' export statement"
+                    "summary": "Deleted the { name1, name2, nameN } from 'foo' export statement"
                 },
                 {
                     "span": {
@@ -1645,7 +1645,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the import1 as name1, import2 as name2, nameN from 'bar' export statement"
+                    "summary": "Deleted the { import1 as name1, import2 as name2, nameN } from 'bar' export statement"
                 }
             ]
         },
@@ -1654,9 +1654,9 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "4ffb72f4091bf1dec741647f5d9e804f0565eea6",
+    "sha1": "14bfef30cb497609690f056b4120a96918884a20",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "57d6396d5040e085e1fd7693bc553a64ca4f9820"
+    "sha2": "6475a067765daa8c5234bcd2f8121e3944908f17"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-replacement-test",
@@ -1676,7 +1676,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name4, name5, name6, nameZ export statement"
+                    "summary": "Deleted the { name4, name5, name6, nameZ } export statement"
                 },
                 {
                     "span": {
@@ -1691,7 +1691,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the variable2 as name2, variable3 as name3, nameY export statement"
+                    "summary": "Deleted the { variable2 as name2, variable3 as name3, nameY } export statement"
                 },
                 {
                     "span": {
@@ -1706,7 +1706,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name3, name4, nameT export statement"
+                    "summary": "Deleted the { name3, name4, nameT } export statement"
                 },
                 {
                     "span": {
@@ -1721,7 +1721,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name2 = value2, name3 = value3, name4, nameO export statement"
+                    "summary": "Deleted the { name2 = value2, name3 = value3, name4, nameO } export statement"
                 },
                 {
                     "span": {
@@ -1736,7 +1736,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the otherNamedFunction export statement"
+                    "summary": "Deleted the { otherNamedFunction } export statement"
                 },
                 {
                     "span": {
@@ -1751,7 +1751,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the newName1 export statement"
+                    "summary": "Deleted the { newName1 } export statement"
                 },
                 {
                     "span": {
@@ -1766,7 +1766,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the anonymous() function export statement"
+                    "summary": "Deleted the { anonymous() } export statement"
                 },
                 {
                     "span": {
@@ -1781,7 +1781,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name2 as statement export statement"
+                    "summary": "Deleted the { name2 as statement } export statement"
                 },
                 {
                     "span": {
@@ -1796,7 +1796,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'baz' export statement"
+                    "summary": "Deleted the { 'baz' } export statement"
                 },
                 {
                     "span": {
@@ -1811,7 +1811,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name7, name8, nameP from 'buzz' export statement"
+                    "summary": "Deleted the { name7, name8, nameP } from 'buzz' export statement"
                 },
                 {
                     "span": {
@@ -1826,7 +1826,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the import6 as name6, import7 as name7, nameB from 'fizz' export statement"
+                    "summary": "Deleted the { import6 as name6, import7 as name7, nameB } from 'fizz' export statement"
                 },
                 {
                     "span": {
@@ -1841,7 +1841,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1, name2, name3, nameN export statement"
+                    "summary": "Deleted the { name1, name2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -1856,7 +1856,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the variable1 as name1, variable2 as name2, nameN export statement"
+                    "summary": "Deleted the { variable1 as name1, variable2 as name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -1871,7 +1871,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1, name2, nameN export statement"
+                    "summary": "Deleted the { name1, name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -1886,7 +1886,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1 = value1, name2 = value2, name3, nameN export statement"
+                    "summary": "Deleted the { name1 = value1, name2 = value2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -1901,7 +1901,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the namedFunction export statement"
+                    "summary": "Deleted the { namedFunction } export statement"
                 },
                 {
                     "span": {
@@ -1916,7 +1916,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the anonymous() function export statement"
+                    "summary": "Deleted the { anonymous() } export statement"
                 },
                 {
                     "span": {
@@ -1931,7 +1931,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1 export statement"
+                    "summary": "Deleted the { name1 } export statement"
                 },
                 {
                     "span": {
@@ -1946,7 +1946,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1 as default export statement"
+                    "summary": "Deleted the { name1 as default } export statement"
                 },
                 {
                     "span": {
@@ -1961,7 +1961,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'foo' export statement"
+                    "summary": "Deleted the { 'foo' } export statement"
                 },
                 {
                     "span": {
@@ -1976,7 +1976,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1, name2, nameN from 'foo' export statement"
+                    "summary": "Deleted the { name1, name2, nameN } from 'foo' export statement"
                 },
                 {
                     "span": {
@@ -1991,7 +1991,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the import1 as name1, import2 as name2, nameN from 'bar' export statement"
+                    "summary": "Deleted the { import1 as name1, import2 as name2, nameN } from 'bar' export statement"
                 },
                 {
                     "span": {
@@ -2006,7 +2006,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name4, name5, name6, nameZ export statement"
+                    "summary": "Added the { name4, name5, name6, nameZ } export statement"
                 },
                 {
                     "span": {
@@ -2021,7 +2021,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the variable2 as name2, variable3 as name3, nameY export statement"
+                    "summary": "Added the { variable2 as name2, variable3 as name3, nameY } export statement"
                 },
                 {
                     "span": {
@@ -2036,7 +2036,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name3, name4, nameT export statement"
+                    "summary": "Added the { name3, name4, nameT } export statement"
                 },
                 {
                     "span": {
@@ -2051,7 +2051,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name2 = value2, name3 = value3, name4, nameO export statement"
+                    "summary": "Added the { name2 = value2, name3 = value3, name4, nameO } export statement"
                 },
                 {
                     "span": {
@@ -2066,7 +2066,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the otherNamedFunction export statement"
+                    "summary": "Added the { otherNamedFunction } export statement"
                 },
                 {
                     "span": {
@@ -2081,7 +2081,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the newName1 export statement"
+                    "summary": "Added the { newName1 } export statement"
                 },
                 {
                     "span": {
@@ -2096,7 +2096,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the anonymous() function export statement"
+                    "summary": "Added the { anonymous() } export statement"
                 },
                 {
                     "span": {
@@ -2111,7 +2111,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name2 as statement export statement"
+                    "summary": "Added the { name2 as statement } export statement"
                 },
                 {
                     "span": {
@@ -2126,7 +2126,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'baz' export statement"
+                    "summary": "Added the { 'baz' } export statement"
                 },
                 {
                     "span": {
@@ -2141,7 +2141,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the name7, name8, nameP from 'buzz' export statement"
+                    "summary": "Added the { name7, name8, nameP } from 'buzz' export statement"
                 },
                 {
                     "span": {
@@ -2156,7 +2156,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the import6 as name6, import7 as name7, nameB from 'fizz' export statement"
+                    "summary": "Added the { import6 as name6, import7 as name7, nameB } from 'fizz' export statement"
                 }
             ]
         },
@@ -2165,9 +2165,9 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "57d6396d5040e085e1fd7693bc553a64ca4f9820",
+    "sha1": "6475a067765daa8c5234bcd2f8121e3944908f17",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "228b95ad00efa68297972f82297fa541da06bcef"
+    "sha2": "c1d860666e4766c7070ab930d9649312a90ee824"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-test",
@@ -2187,7 +2187,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1, name2, name3, nameN export statement"
+                    "summary": "Deleted the { name1, name2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -2202,7 +2202,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the variable1 as name1, variable2 as name2, nameN export statement"
+                    "summary": "Deleted the { variable1 as name1, variable2 as name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -2217,7 +2217,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1, name2, nameN export statement"
+                    "summary": "Deleted the { name1, name2, nameN } export statement"
                 },
                 {
                     "span": {
@@ -2232,7 +2232,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1 = value1, name2 = value2, name3, nameN export statement"
+                    "summary": "Deleted the { name1 = value1, name2 = value2, name3, nameN } export statement"
                 },
                 {
                     "span": {
@@ -2247,7 +2247,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the namedFunction export statement"
+                    "summary": "Deleted the { namedFunction } export statement"
                 },
                 {
                     "span": {
@@ -2262,7 +2262,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the anonymous() function export statement"
+                    "summary": "Deleted the { anonymous() } export statement"
                 },
                 {
                     "span": {
@@ -2277,7 +2277,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1 export statement"
+                    "summary": "Deleted the { name1 } export statement"
                 },
                 {
                     "span": {
@@ -2292,7 +2292,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1 as default export statement"
+                    "summary": "Deleted the { name1 as default } export statement"
                 },
                 {
                     "span": {
@@ -2307,7 +2307,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'foo' export statement"
+                    "summary": "Deleted the { 'foo' } export statement"
                 },
                 {
                     "span": {
@@ -2322,7 +2322,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name1, name2, nameN from 'foo' export statement"
+                    "summary": "Deleted the { name1, name2, nameN } from 'foo' export statement"
                 },
                 {
                     "span": {
@@ -2337,7 +2337,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the import1 as name1, import2 as name2, nameN from 'bar' export statement"
+                    "summary": "Deleted the { import1 as name1, import2 as name2, nameN } from 'bar' export statement"
                 }
             ]
         },
@@ -2346,9 +2346,9 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "228b95ad00efa68297972f82297fa541da06bcef",
+    "sha1": "c1d860666e4766c7070ab930d9649312a90ee824",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "dd4e4ff10f7dda7b7bc1852747ca61eac91d9de7"
+    "sha2": "8bca2ad156741776435a77afd93158ec337acabf"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-rest-test",
@@ -2368,7 +2368,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name4, name5, name6, nameZ export statement"
+                    "summary": "Deleted the { name4, name5, name6, nameZ } export statement"
                 },
                 {
                     "span": {
@@ -2383,7 +2383,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the variable2 as name2, variable3 as name3, nameY export statement"
+                    "summary": "Deleted the { variable2 as name2, variable3 as name3, nameY } export statement"
                 },
                 {
                     "span": {
@@ -2398,7 +2398,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name3, name4, nameT export statement"
+                    "summary": "Deleted the { name3, name4, nameT } export statement"
                 },
                 {
                     "span": {
@@ -2413,7 +2413,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name2 = value2, name3 = value3, name4, nameO export statement"
+                    "summary": "Deleted the { name2 = value2, name3 = value3, name4, nameO } export statement"
                 },
                 {
                     "span": {
@@ -2428,7 +2428,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the otherNamedFunction export statement"
+                    "summary": "Deleted the { otherNamedFunction } export statement"
                 },
                 {
                     "span": {
@@ -2443,7 +2443,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the newName1 export statement"
+                    "summary": "Deleted the { newName1 } export statement"
                 },
                 {
                     "span": {
@@ -2458,7 +2458,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the anonymous() function export statement"
+                    "summary": "Deleted the { anonymous() } export statement"
                 },
                 {
                     "span": {
@@ -2473,7 +2473,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name2 as statement export statement"
+                    "summary": "Deleted the { name2 as statement } export statement"
                 },
                 {
                     "span": {
@@ -2488,7 +2488,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'baz' export statement"
+                    "summary": "Deleted the { 'baz' } export statement"
                 },
                 {
                     "span": {
@@ -2503,7 +2503,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the name7, name8, nameP from 'buzz' export statement"
+                    "summary": "Deleted the { name7, name8, nameP } from 'buzz' export statement"
                 },
                 {
                     "span": {
@@ -2518,7 +2518,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the import6 as name6, import7 as name7, nameB from 'fizz' export statement"
+                    "summary": "Deleted the { import6 as name6, import7 as name7, nameB } from 'fizz' export statement"
                 }
             ]
         },
@@ -2527,7 +2527,7 @@
     "filePaths": [
         "export.js"
     ],
-    "sha1": "dd4e4ff10f7dda7b7bc1852747ca61eac91d9de7",
+    "sha1": "8bca2ad156741776435a77afd93158ec337acabf",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "dce5b472e5bcc43861e65b412644c7931f12d313"
+    "sha2": "bf2b590ed40af0da0e712c1305c01a5033aef975"
 }]
diff --git a/test/corpus/diff-summaries/javascript/nested-functions.json b/test/corpus/diff-summaries/javascript/nested-functions.json
index 39ed1daac..ee0008ef2 100644
--- a/test/corpus/diff-summaries/javascript/nested-functions.json
+++ b/test/corpus/diff-summaries/javascript/nested-functions.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "nested-functions.js"
     ],
-    "sha1": "af0eafa72dc7a6795507858b2c2f9ceee614de07",
+    "sha1": "5f2fcbf698ced64bbf9838fcaffe1f9e16bcd25d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "71935f67586876686341a26b8cb2a41794820a6f"
+    "sha2": "289611d46d1853b6408423d260038d489f0e3e9d"
 }
 ,{
     "testCaseDescription": "javascript-nested-functions-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "nested-functions.js"
     ],
-    "sha1": "71935f67586876686341a26b8cb2a41794820a6f",
+    "sha1": "289611d46d1853b6408423d260038d489f0e3e9d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4ea4f4876b9375f13a68d7254ad672d07b722fdf"
+    "sha2": "350476e306bfce403a33b825b0781061d016e1a8"
 }
 ,{
     "testCaseDescription": "javascript-nested-functions-delete-insert-test",
@@ -141,9 +141,9 @@
     "filePaths": [
         "nested-functions.js"
     ],
-    "sha1": "4ea4f4876b9375f13a68d7254ad672d07b722fdf",
+    "sha1": "350476e306bfce403a33b825b0781061d016e1a8",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "be32782b7ddcfa08396ac01c82e30bf7b1df40e7"
+    "sha2": "b2211f880a5e9f4d41b929901d01e4d98044d507"
 }
 ,{
     "testCaseDescription": "javascript-nested-functions-replacement-test",
@@ -211,9 +211,9 @@
     "filePaths": [
         "nested-functions.js"
     ],
-    "sha1": "be32782b7ddcfa08396ac01c82e30bf7b1df40e7",
+    "sha1": "b2211f880a5e9f4d41b929901d01e4d98044d507",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "550a976d210674327b23b298e527abe2b58dec79"
+    "sha2": "0d2126d47656bcb6f1ce2ca1aebb6afa84575d47"
 }
 ,{
     "testCaseDescription": "javascript-nested-functions-delete-replacement-test",
@@ -272,9 +272,9 @@
     "filePaths": [
         "nested-functions.js"
     ],
-    "sha1": "550a976d210674327b23b298e527abe2b58dec79",
+    "sha1": "0d2126d47656bcb6f1ce2ca1aebb6afa84575d47",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "cfd77d1d21ca5a1425846fe50bc154ce78ad5e6f"
+    "sha2": "25d417cd7e815b23ac9fdf139a12f3386df8ade1"
 }
 ,{
     "testCaseDescription": "javascript-nested-functions-delete-test",
@@ -303,9 +303,9 @@
     "filePaths": [
         "nested-functions.js"
     ],
-    "sha1": "cfd77d1d21ca5a1425846fe50bc154ce78ad5e6f",
+    "sha1": "25d417cd7e815b23ac9fdf139a12f3386df8ade1",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "75785663836095672233edd2495ec92237d0dbcc"
+    "sha2": "7f7efb3fe8e90399b642b293fa6128e2f5c99a65"
 }
 ,{
     "testCaseDescription": "javascript-nested-functions-delete-rest-test",
@@ -334,7 +334,7 @@
     "filePaths": [
         "nested-functions.js"
     ],
-    "sha1": "75785663836095672233edd2495ec92237d0dbcc",
+    "sha1": "7f7efb3fe8e90399b642b293fa6128e2f5c99a65",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "02b2a7bb2b9b4d27a06afbe6d147ca70e6eccf1a"
+    "sha2": "1b10f4afdd01b8dc19287f5e87bc3130a1a699f1"
 }]
diff --git a/test/corpus/diff-summaries/javascript/null.json b/test/corpus/diff-summaries/javascript/null.json
index 5f59a978a..87c36ec5f 100644
--- a/test/corpus/diff-summaries/javascript/null.json
+++ b/test/corpus/diff-summaries/javascript/null.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "null.js"
     ],
-    "sha1": "0eb0a48a27bc6b8d01a210eea8cbccab5c6823f7",
+    "sha1": "410da433aeffed005170be5d48c34ff88624e920",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "921a57a0891031baea0fa0ebfc5c1270751eb7c3"
+    "sha2": "a59bac6b1993b0d25260441e0d7016449050c85c"
 }
 ,{
     "testCaseDescription": "javascript-null-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "null.js"
     ],
-    "sha1": "921a57a0891031baea0fa0ebfc5c1270751eb7c3",
+    "sha1": "a59bac6b1993b0d25260441e0d7016449050c85c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1f137a24235834a5454a98078d3abb07cbdf1063"
+    "sha2": "7147443e6583aa65d98ea66888f49b4d280d2036"
 }
 ,{
     "testCaseDescription": "javascript-null-delete-insert-test",
@@ -117,9 +117,9 @@
     "filePaths": [
         "null.js"
     ],
-    "sha1": "1f137a24235834a5454a98078d3abb07cbdf1063",
+    "sha1": "7147443e6583aa65d98ea66888f49b4d280d2036",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1a76251123795db3deefceda4488e44d2eb80193"
+    "sha2": "b51ef21eb234bf7e3d19fd101398b6bf27480304"
 }
 ,{
     "testCaseDescription": "javascript-null-replacement-test",
@@ -163,9 +163,9 @@
     "filePaths": [
         "null.js"
     ],
-    "sha1": "1a76251123795db3deefceda4488e44d2eb80193",
+    "sha1": "b51ef21eb234bf7e3d19fd101398b6bf27480304",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a7adbf72c2079adee39b2dbcc46a29447cc5b452"
+    "sha2": "bdb46d9237c943d680709bb78e24345389bc938b"
 }
 ,{
     "testCaseDescription": "javascript-null-delete-replacement-test",
@@ -224,9 +224,9 @@
     "filePaths": [
         "null.js"
     ],
-    "sha1": "a7adbf72c2079adee39b2dbcc46a29447cc5b452",
+    "sha1": "bdb46d9237c943d680709bb78e24345389bc938b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "72144a33117dda641088c950e9ba56808c39d69d"
+    "sha2": "8d8c213bb8112ecd2e17f047a4a03d91ea50488e"
 }
 ,{
     "testCaseDescription": "javascript-null-delete-test",
@@ -255,9 +255,9 @@
     "filePaths": [
         "null.js"
     ],
-    "sha1": "72144a33117dda641088c950e9ba56808c39d69d",
+    "sha1": "8d8c213bb8112ecd2e17f047a4a03d91ea50488e",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7985243cb79eac510cc068710b58cff711ca4df7"
+    "sha2": "f3793224bdeab86190718de3147cf7dcc316e393"
 }
 ,{
     "testCaseDescription": "javascript-null-delete-rest-test",
@@ -286,7 +286,7 @@
     "filePaths": [
         "null.js"
     ],
-    "sha1": "7985243cb79eac510cc068710b58cff711ca4df7",
+    "sha1": "f3793224bdeab86190718de3147cf7dcc316e393",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0785f1ff3205013dcbd5f5ca4d172e25f57b5969"
+    "sha2": "26de5bbd84f65ce72c3d6fbe14c7ec14c398bad1"
 }]
diff --git a/test/corpus/diff-summaries/javascript/number.json b/test/corpus/diff-summaries/javascript/number.json
index a4c818aea..1b112fefc 100644
--- a/test/corpus/diff-summaries/javascript/number.json
+++ b/test/corpus/diff-summaries/javascript/number.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "number.js"
     ],
-    "sha1": "f5a546c68e4e82d0b350e3e9674659e65c938c55",
+    "sha1": "922ed84b99c488af51ec7deeecd091497b411aee",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "47960ec40f3ccbcb1153c70f228c9938575ab8ad"
+    "sha2": "019a318a7048e122ce5b80bc133af9c2895b771f"
 }
 ,{
     "testCaseDescription": "javascript-number-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "number.js"
     ],
-    "sha1": "47960ec40f3ccbcb1153c70f228c9938575ab8ad",
+    "sha1": "019a318a7048e122ce5b80bc133af9c2895b771f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "06220f52068d26a6bcf0d23f6be481825f7923a4"
+    "sha2": "2866eac1ca1c10ae4bf8aa2b154d3da0a8f06c46"
 }
 ,{
     "testCaseDescription": "javascript-number-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "number.js"
     ],
-    "sha1": "06220f52068d26a6bcf0d23f6be481825f7923a4",
+    "sha1": "2866eac1ca1c10ae4bf8aa2b154d3da0a8f06c46",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "404abb4553e8356df1399600d506705c6c9b3ab6"
+    "sha2": "d87c3306a870736dfede176bfdeb80c1b7cb9c38"
 }
 ,{
     "testCaseDescription": "javascript-number-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "number.js"
     ],
-    "sha1": "404abb4553e8356df1399600d506705c6c9b3ab6",
+    "sha1": "d87c3306a870736dfede176bfdeb80c1b7cb9c38",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7036f73a00a5222e5d9d889fe5b47ef4d77478b9"
+    "sha2": "20251a3a62305bb2a2be2961f8fb2cb648dc0433"
 }
 ,{
     "testCaseDescription": "javascript-number-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "number.js"
     ],
-    "sha1": "7036f73a00a5222e5d9d889fe5b47ef4d77478b9",
+    "sha1": "20251a3a62305bb2a2be2961f8fb2cb648dc0433",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "20984d5e617ddcbc04c1e539365976b48ba4c5e2"
+    "sha2": "f63b77f1b409c833aaa5fe5534c0404855d89fc8"
 }
 ,{
     "testCaseDescription": "javascript-number-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "number.js"
     ],
-    "sha1": "20984d5e617ddcbc04c1e539365976b48ba4c5e2",
+    "sha1": "f63b77f1b409c833aaa5fe5534c0404855d89fc8",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a2dd3c4c8887c73ef3ade2a1e819266cf421eca5"
+    "sha2": "443f675b2a1a2d2c92daf68afeba97952edf6ca5"
 }
 ,{
     "testCaseDescription": "javascript-number-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "number.js"
     ],
-    "sha1": "a2dd3c4c8887c73ef3ade2a1e819266cf421eca5",
+    "sha1": "443f675b2a1a2d2c92daf68afeba97952edf6ca5",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "743cb64f1ee8a3d9f0b4ea142f1a7e8447757885"
+    "sha2": "047dee13a562a6346c686b692d7b6c4d8c83da34"
 }]
diff --git a/test/corpus/diff-summaries/javascript/object-with-methods.json b/test/corpus/diff-summaries/javascript/object-with-methods.json
index fef618283..e1b4f728d 100644
--- a/test/corpus/diff-summaries/javascript/object-with-methods.json
+++ b/test/corpus/diff-summaries/javascript/object-with-methods.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "objects-with-methods.js"
     ],
-    "sha1": "9dbca3237fd8109ff6cad0cb5060962d58f10b6c",
+    "sha1": "a94a2720b036dc4b5368d6b14917653245ae5a3c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "394896ec5ce46aa45a7fc7410424fd8682a2a70c"
+    "sha2": "e4505e22c68ea9814f499d6cf8a0463fa6eefba0"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "objects-with-methods.js"
     ],
-    "sha1": "394896ec5ce46aa45a7fc7410424fd8682a2a70c",
+    "sha1": "e4505e22c68ea9814f499d6cf8a0463fa6eefba0",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e560db785a8c18a5f977a29c818a72926c4650ad"
+    "sha2": "f94f5e2997653152bcb9f6b52afe316d4f337996"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "objects-with-methods.js"
     ],
-    "sha1": "e560db785a8c18a5f977a29c818a72926c4650ad",
+    "sha1": "f94f5e2997653152bcb9f6b52afe316d4f337996",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "62fd8c060f49723f91a0f405b48fe9590f519db8"
+    "sha2": "f0f2c884c7c1e72cc8a007998bb956d61dd3343d"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "objects-with-methods.js"
     ],
-    "sha1": "62fd8c060f49723f91a0f405b48fe9590f519db8",
+    "sha1": "f0f2c884c7c1e72cc8a007998bb956d61dd3343d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "381f0d3aa4e0c53b425eb42b9f3216c07aa5c3bb"
+    "sha2": "ab1bdda0e1eb883e1effe51a21e5a14624b007e4"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "objects-with-methods.js"
     ],
-    "sha1": "381f0d3aa4e0c53b425eb42b9f3216c07aa5c3bb",
+    "sha1": "ab1bdda0e1eb883e1effe51a21e5a14624b007e4",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e86ec26bc3f4e22c3bef80eae7f4afbe9c3b641d"
+    "sha2": "0fda9c3d7329ed71b32076382e9a2f194a293a75"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "objects-with-methods.js"
     ],
-    "sha1": "e86ec26bc3f4e22c3bef80eae7f4afbe9c3b641d",
+    "sha1": "0fda9c3d7329ed71b32076382e9a2f194a293a75",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "04fb0de0a79aef0c8d6160504a7489dae59b7322"
+    "sha2": "bd72eeefd26297bd36cfc98333e06e9b2c34f65b"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "objects-with-methods.js"
     ],
-    "sha1": "04fb0de0a79aef0c8d6160504a7489dae59b7322",
+    "sha1": "bd72eeefd26297bd36cfc98333e06e9b2c34f65b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f10a454e09922f6b39b73d7a2d1c490a2a4b6179"
+    "sha2": "6cb3f7c75c67aaf2b10151a7770cb734ecbce07d"
 }]
diff --git a/test/corpus/diff-summaries/javascript/object.json b/test/corpus/diff-summaries/javascript/object.json
index a65123315..126b7453a 100644
--- a/test/corpus/diff-summaries/javascript/object.json
+++ b/test/corpus/diff-summaries/javascript/object.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "object.js"
     ],
-    "sha1": "aefeb00bb872d8308fb1f9989a0b30bee53f794e",
+    "sha1": "3c9f9bc0b38eafc97770ee843cff9238ea911658",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8d7f9432e5eccbac5a2dce503cb6e9aabe691f64"
+    "sha2": "355913b279292fa7ad74f9aa90c3cfa74e67a6ec"
 }
 ,{
     "testCaseDescription": "javascript-object-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "object.js"
     ],
-    "sha1": "8d7f9432e5eccbac5a2dce503cb6e9aabe691f64",
+    "sha1": "355913b279292fa7ad74f9aa90c3cfa74e67a6ec",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d4b9e799adb79bd4cc813ce5b7a528e65956b227"
+    "sha2": "da0ad1cdb2f21747ff6a425162851f87454a1b4d"
 }
 ,{
     "testCaseDescription": "javascript-object-delete-insert-test",
@@ -117,9 +117,9 @@
     "filePaths": [
         "object.js"
     ],
-    "sha1": "d4b9e799adb79bd4cc813ce5b7a528e65956b227",
+    "sha1": "da0ad1cdb2f21747ff6a425162851f87454a1b4d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "181fb7d0795181379db61ff3d91e73e17a7f0176"
+    "sha2": "87b76e028695ade2f71c5af219a55b60083a1ccf"
 }
 ,{
     "testCaseDescription": "javascript-object-replacement-test",
@@ -163,9 +163,9 @@
     "filePaths": [
         "object.js"
     ],
-    "sha1": "181fb7d0795181379db61ff3d91e73e17a7f0176",
+    "sha1": "87b76e028695ade2f71c5af219a55b60083a1ccf",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "48b14e07a2432070ba8edc7a97b3a3f5744c4f95"
+    "sha2": "1762e84a9edd3630b58547e74b68cb4499fba0c1"
 }
 ,{
     "testCaseDescription": "javascript-object-delete-replacement-test",
@@ -224,9 +224,9 @@
     "filePaths": [
         "object.js"
     ],
-    "sha1": "48b14e07a2432070ba8edc7a97b3a3f5744c4f95",
+    "sha1": "1762e84a9edd3630b58547e74b68cb4499fba0c1",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "76e45b38000091fee41bc0a0a9f3a5cd65c5492d"
+    "sha2": "ec3a77d723892e90306fe26786e78589550fcc0f"
 }
 ,{
     "testCaseDescription": "javascript-object-delete-test",
@@ -255,9 +255,9 @@
     "filePaths": [
         "object.js"
     ],
-    "sha1": "76e45b38000091fee41bc0a0a9f3a5cd65c5492d",
+    "sha1": "ec3a77d723892e90306fe26786e78589550fcc0f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2a18894fa97cf6cfb430156aa4a2e0acee543c4c"
+    "sha2": "67b4825b9bf7e61438631de081a6529b8f406119"
 }
 ,{
     "testCaseDescription": "javascript-object-delete-rest-test",
@@ -286,7 +286,7 @@
     "filePaths": [
         "object.js"
     ],
-    "sha1": "2a18894fa97cf6cfb430156aa4a2e0acee543c4c",
+    "sha1": "67b4825b9bf7e61438631de081a6529b8f406119",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0f272e863d223922521e94218a6aace378859dde"
+    "sha2": "65a869f9389f9695bf175418cf1ea37123072e4b"
 }]
diff --git a/test/corpus/diff-summaries/javascript/regex.json b/test/corpus/diff-summaries/javascript/regex.json
index fa918834e..000c8dd55 100644
--- a/test/corpus/diff-summaries/javascript/regex.json
+++ b/test/corpus/diff-summaries/javascript/regex.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "regex.js"
     ],
-    "sha1": "af8dfb899e64bd94fbe9b1d763d771e5140c1334",
+    "sha1": "4751c30473b0ed9b3f0735b65a88b2e756832a08",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5c553b5de509611f50d8cea38e7bc08712e40f84"
+    "sha2": "a382324fe08a36e1d5fb1ce06680e37c8a2a2c48"
 }
 ,{
     "testCaseDescription": "javascript-regex-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "regex.js"
     ],
-    "sha1": "5c553b5de509611f50d8cea38e7bc08712e40f84",
+    "sha1": "a382324fe08a36e1d5fb1ce06680e37c8a2a2c48",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "62fa5611314d347cba6ca512031b7e98d7ed9d29"
+    "sha2": "d7ec56aca755965fc47bafe716742c6df97fd034"
 }
 ,{
     "testCaseDescription": "javascript-regex-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "regex.js"
     ],
-    "sha1": "62fa5611314d347cba6ca512031b7e98d7ed9d29",
+    "sha1": "d7ec56aca755965fc47bafe716742c6df97fd034",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "405e7ab802aa3db2bac92cdb20f99bf410c57dbc"
+    "sha2": "7e53ab0d5cc9f4db6e87cf5abbceba6dddb9f8a9"
 }
 ,{
     "testCaseDescription": "javascript-regex-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "regex.js"
     ],
-    "sha1": "405e7ab802aa3db2bac92cdb20f99bf410c57dbc",
+    "sha1": "7e53ab0d5cc9f4db6e87cf5abbceba6dddb9f8a9",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4884de88825e39386b25a8e169e393739c8bce7f"
+    "sha2": "a0fefe9e9cf28b3f45e650616b16dc981fd162f0"
 }
 ,{
     "testCaseDescription": "javascript-regex-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "regex.js"
     ],
-    "sha1": "4884de88825e39386b25a8e169e393739c8bce7f",
+    "sha1": "a0fefe9e9cf28b3f45e650616b16dc981fd162f0",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6c23a5a1bd35e05cad7084429ae5cca16951c4dd"
+    "sha2": "b82d6edd8810a4402cd79e38fcb10aae022509c0"
 }
 ,{
     "testCaseDescription": "javascript-regex-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "regex.js"
     ],
-    "sha1": "6c23a5a1bd35e05cad7084429ae5cca16951c4dd",
+    "sha1": "b82d6edd8810a4402cd79e38fcb10aae022509c0",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ab5b91f92abd2e34adfba5a1819cbe1c84ec0e65"
+    "sha2": "65b945188e53cf671399487227b057e410dda239"
 }
 ,{
     "testCaseDescription": "javascript-regex-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "regex.js"
     ],
-    "sha1": "ab5b91f92abd2e34adfba5a1819cbe1c84ec0e65",
+    "sha1": "65b945188e53cf671399487227b057e410dda239",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b5b96ac96b0968b5b9d02ce5844f7274e13f3554"
+    "sha2": "1a4f41ba557d718e535fb8adf824b9064d6c11ee"
 }]
diff --git a/test/corpus/diff-summaries/javascript/relational-operator.json b/test/corpus/diff-summaries/javascript/relational-operator.json
index 3471566a6..13eb749d1 100644
--- a/test/corpus/diff-summaries/javascript/relational-operator.json
+++ b/test/corpus/diff-summaries/javascript/relational-operator.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "relational-operator.js"
     ],
-    "sha1": "707d6d491b49e1d91b26dc55086e140e997fcaf4",
+    "sha1": "25d3c0bb291610765c70e099d718ad8c4f155a35",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "916c235b3685819d8f98b4805abe2a2f863cee37"
+    "sha2": "6099f52d94adfb38903bcf036d31ae55a7bf9597"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "relational-operator.js"
     ],
-    "sha1": "916c235b3685819d8f98b4805abe2a2f863cee37",
+    "sha1": "6099f52d94adfb38903bcf036d31ae55a7bf9597",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fe34e80ceab52842be3fae1f56c762da6716100f"
+    "sha2": "fae5ce262626b197d4b64dac93da939db27e4e32"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-delete-insert-test",
@@ -84,9 +84,9 @@
     "filePaths": [
         "relational-operator.js"
     ],
-    "sha1": "fe34e80ceab52842be3fae1f56c762da6716100f",
+    "sha1": "fae5ce262626b197d4b64dac93da939db27e4e32",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "12ace7b189aaa7cd68b7735eafa5ba5af428222e"
+    "sha2": "4f8ffc7697f43e727dfa192d44d48e05fed49069"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-replacement-test",
@@ -97,9 +97,9 @@
     "filePaths": [
         "relational-operator.js"
     ],
-    "sha1": "12ace7b189aaa7cd68b7735eafa5ba5af428222e",
+    "sha1": "4f8ffc7697f43e727dfa192d44d48e05fed49069",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fd43a8853b4536d9b2cfb81fac73ab21a59ecb7d"
+    "sha2": "ae48c86aabb47e659f30676ea602d89507eafb59"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-delete-replacement-test",
@@ -128,9 +128,9 @@
     "filePaths": [
         "relational-operator.js"
     ],
-    "sha1": "fd43a8853b4536d9b2cfb81fac73ab21a59ecb7d",
+    "sha1": "ae48c86aabb47e659f30676ea602d89507eafb59",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "76f7572bb3b4761c61b2234b8078fc3dbb74b214"
+    "sha2": "008c2621eb13b5e3616cc7fbc80be8b2c3fc4535"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-delete-test",
@@ -159,9 +159,9 @@
     "filePaths": [
         "relational-operator.js"
     ],
-    "sha1": "76f7572bb3b4761c61b2234b8078fc3dbb74b214",
+    "sha1": "008c2621eb13b5e3616cc7fbc80be8b2c3fc4535",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4f1db5cef124c17f6473e7fca95c07ae3f84a4f9"
+    "sha2": "841e7c9cf971711edfd38ba7144665b7cd4012e3"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-delete-rest-test",
@@ -190,7 +190,7 @@
     "filePaths": [
         "relational-operator.js"
     ],
-    "sha1": "4f1db5cef124c17f6473e7fca95c07ae3f84a4f9",
+    "sha1": "841e7c9cf971711edfd38ba7144665b7cd4012e3",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "22f62c999613fdb9f40f1fcabfd6e3900de152cb"
+    "sha2": "52d876c58866740cec26b6397564dd53df2b6994"
 }]
diff --git a/test/corpus/diff-summaries/javascript/return-statement.json b/test/corpus/diff-summaries/javascript/return-statement.json
index 23e667850..136025a2e 100644
--- a/test/corpus/diff-summaries/javascript/return-statement.json
+++ b/test/corpus/diff-summaries/javascript/return-statement.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "return-statement.js"
     ],
-    "sha1": "f6aaca47eff83aa2dd6a8ce2e41b14394977d9b3",
+    "sha1": "c90f08348827efc7e4c9c63b0efcbb08ae424b57",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "524d62d049c00b51a2cea985dfb7ce08c0b6d073"
+    "sha2": "b17f211f9ec5e3ce4d9087368e847ff8a8d064b7"
 }
 ,{
     "testCaseDescription": "javascript-return-statement-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "return-statement.js"
     ],
-    "sha1": "524d62d049c00b51a2cea985dfb7ce08c0b6d073",
+    "sha1": "b17f211f9ec5e3ce4d9087368e847ff8a8d064b7",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8041d77efbe04a7cd0f2ba66793621e61e0c74e3"
+    "sha2": "850c805ca70eed7925301409f60e57df2d9182cd"
 }
 ,{
     "testCaseDescription": "javascript-return-statement-delete-insert-test",
@@ -102,9 +102,9 @@
     "filePaths": [
         "return-statement.js"
     ],
-    "sha1": "8041d77efbe04a7cd0f2ba66793621e61e0c74e3",
+    "sha1": "850c805ca70eed7925301409f60e57df2d9182cd",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "62102491107e2639f888bcb06ba212d8697cbbaf"
+    "sha2": "d35d555414c9536c0dbd5ff45d4d0bc6a1ad8a67"
 }
 ,{
     "testCaseDescription": "javascript-return-statement-replacement-test",
@@ -133,9 +133,9 @@
     "filePaths": [
         "return-statement.js"
     ],
-    "sha1": "62102491107e2639f888bcb06ba212d8697cbbaf",
+    "sha1": "d35d555414c9536c0dbd5ff45d4d0bc6a1ad8a67",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a9ab5b797c44abed96f142adcfe1da66f0b1a5d4"
+    "sha2": "c599ce42b6761a60050db7254d28e26f23baa974"
 }
 ,{
     "testCaseDescription": "javascript-return-statement-delete-replacement-test",
@@ -194,9 +194,9 @@
     "filePaths": [
         "return-statement.js"
     ],
-    "sha1": "a9ab5b797c44abed96f142adcfe1da66f0b1a5d4",
+    "sha1": "c599ce42b6761a60050db7254d28e26f23baa974",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "86d283e41d3acb1a891c8212466478d832e7cf4f"
+    "sha2": "899b540256ea22a87970ad200ab4fe1141ae158a"
 }
 ,{
     "testCaseDescription": "javascript-return-statement-delete-test",
@@ -225,9 +225,9 @@
     "filePaths": [
         "return-statement.js"
     ],
-    "sha1": "86d283e41d3acb1a891c8212466478d832e7cf4f",
+    "sha1": "899b540256ea22a87970ad200ab4fe1141ae158a",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5f60834d911eb278ea13e451d5c62e658f8dd7c4"
+    "sha2": "7a4b9f4b9fd3dbdadb556affa6006ef33ba5a70a"
 }
 ,{
     "testCaseDescription": "javascript-return-statement-delete-rest-test",
@@ -256,7 +256,7 @@
     "filePaths": [
         "return-statement.js"
     ],
-    "sha1": "5f60834d911eb278ea13e451d5c62e658f8dd7c4",
+    "sha1": "7a4b9f4b9fd3dbdadb556affa6006ef33ba5a70a",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c94930423eb6a6e61d369ac9025d969d2d2e6c1a"
+    "sha2": "8fa7057b21b500aaf4b78039e8d494f0c6b87478"
 }]
diff --git a/test/corpus/diff-summaries/javascript/string.json b/test/corpus/diff-summaries/javascript/string.json
index e0d64f435..b96211fc6 100644
--- a/test/corpus/diff-summaries/javascript/string.json
+++ b/test/corpus/diff-summaries/javascript/string.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "string.js"
     ],
-    "sha1": "2c57559d605a6fe81e465c7fab6c70b3ed995911",
+    "sha1": "de44505f44a479b57fe2dfc70bc9b1ab410921a4",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "63d3e81fd7d64a832830e004ea516b53f8781779"
+    "sha2": "f9db4d4cc431a68dafaf45636d30c8a90df60464"
 }
 ,{
     "testCaseDescription": "javascript-string-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "string.js"
     ],
-    "sha1": "63d3e81fd7d64a832830e004ea516b53f8781779",
+    "sha1": "f9db4d4cc431a68dafaf45636d30c8a90df60464",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "51fa8e3cc925686b215735182f750faa5820479b"
+    "sha2": "fc8d27bd8f6eaa3701c0b741d68908e006470e6e"
 }
 ,{
     "testCaseDescription": "javascript-string-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "string.js"
     ],
-    "sha1": "51fa8e3cc925686b215735182f750faa5820479b",
+    "sha1": "fc8d27bd8f6eaa3701c0b741d68908e006470e6e",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fd50f8ac493b23fe746ee14b683b6c51af6503ec"
+    "sha2": "dc734339965cea9c61b21927e9a6a5489970129f"
 }
 ,{
     "testCaseDescription": "javascript-string-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "string.js"
     ],
-    "sha1": "fd50f8ac493b23fe746ee14b683b6c51af6503ec",
+    "sha1": "dc734339965cea9c61b21927e9a6a5489970129f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "890a07342ca69ed4057e75883d8b42275147405d"
+    "sha2": "a998b7793edf8790caff0cf86ae06d45576d41bd"
 }
 ,{
     "testCaseDescription": "javascript-string-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "string.js"
     ],
-    "sha1": "890a07342ca69ed4057e75883d8b42275147405d",
+    "sha1": "a998b7793edf8790caff0cf86ae06d45576d41bd",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "93afe1101fa2f097436cdbf596d0d8f1f8857999"
+    "sha2": "f0277188355481d1ac763b8be03a95d6a4b326b7"
 }
 ,{
     "testCaseDescription": "javascript-string-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "string.js"
     ],
-    "sha1": "93afe1101fa2f097436cdbf596d0d8f1f8857999",
+    "sha1": "f0277188355481d1ac763b8be03a95d6a4b326b7",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "77450417d7c60d4c5e9027dbe758092098a51ad1"
+    "sha2": "1dc2645fb7e9f55ddc82a0581066a1d33c3ddac3"
 }
 ,{
     "testCaseDescription": "javascript-string-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "string.js"
     ],
-    "sha1": "77450417d7c60d4c5e9027dbe758092098a51ad1",
+    "sha1": "1dc2645fb7e9f55ddc82a0581066a1d33c3ddac3",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2bdf24d58c9431fd69cc73d80180388bb579a170"
+    "sha2": "2685bf57f0230658d78deb89ea4defa0406cf218"
 }]
diff --git a/test/corpus/diff-summaries/javascript/subscript-access-assignment.json b/test/corpus/diff-summaries/javascript/subscript-access-assignment.json
index ea0f1a079..aa82bf9e9 100644
--- a/test/corpus/diff-summaries/javascript/subscript-access-assignment.json
+++ b/test/corpus/diff-summaries/javascript/subscript-access-assignment.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "subscript-access-assignment.js"
     ],
-    "sha1": "64a9a65e90cf48c435d6c1c46b80cf7935b26413",
+    "sha1": "afcb0de83fe2727bbbbcae76a09687ecd7042fee",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0148ee834e361c93f645aa32ac05516803f56d3d"
+    "sha2": "847837fa18b60f276d3d7770768e52e5eb41dc76"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-assignment-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "subscript-access-assignment.js"
     ],
-    "sha1": "0148ee834e361c93f645aa32ac05516803f56d3d",
+    "sha1": "847837fa18b60f276d3d7770768e52e5eb41dc76",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "bcdee486f71016fc693985b4f6a5d0d472e8c5ff"
+    "sha2": "638161bf0a81f22ad334abb716f187f51980a0e6"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-assignment-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "subscript-access-assignment.js"
     ],
-    "sha1": "bcdee486f71016fc693985b4f6a5d0d472e8c5ff",
+    "sha1": "638161bf0a81f22ad334abb716f187f51980a0e6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7f3bc8ffdd75c0bfba679d28e3d16105a50eb9f8"
+    "sha2": "78ebdf6029db034d9fde03d0603297e4a86f9e64"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-assignment-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "subscript-access-assignment.js"
     ],
-    "sha1": "7f3bc8ffdd75c0bfba679d28e3d16105a50eb9f8",
+    "sha1": "78ebdf6029db034d9fde03d0603297e4a86f9e64",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c3aff9f350cd0e8260f4a384b249bf7a94e7acb1"
+    "sha2": "5cc5c08836f85bc29a0ba8e496fa91c4e74c1068"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-assignment-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "subscript-access-assignment.js"
     ],
-    "sha1": "c3aff9f350cd0e8260f4a384b249bf7a94e7acb1",
+    "sha1": "5cc5c08836f85bc29a0ba8e496fa91c4e74c1068",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f31563441a2e6ad63ed5a261a4f7be1a11b82eac"
+    "sha2": "cbb141868509aeb6acee392f6e7b858e12621d4d"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-assignment-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "subscript-access-assignment.js"
     ],
-    "sha1": "f31563441a2e6ad63ed5a261a4f7be1a11b82eac",
+    "sha1": "cbb141868509aeb6acee392f6e7b858e12621d4d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6d226d202513c5c50d0ceb3f3fd85f8d303fcf74"
+    "sha2": "1449481d7eadf3023871abd587673e1dfa1fc42f"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-assignment-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "subscript-access-assignment.js"
     ],
-    "sha1": "6d226d202513c5c50d0ceb3f3fd85f8d303fcf74",
+    "sha1": "1449481d7eadf3023871abd587673e1dfa1fc42f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "acc75ec053faa10bfebdd149cbf41d414f3089fb"
+    "sha2": "dbbda80970d8f64f7bb03cb4be491e61fa6c27a6"
 }]
diff --git a/test/corpus/diff-summaries/javascript/subscript-access-string.json b/test/corpus/diff-summaries/javascript/subscript-access-string.json
index f04e218c8..bbe21ae9b 100644
--- a/test/corpus/diff-summaries/javascript/subscript-access-string.json
+++ b/test/corpus/diff-summaries/javascript/subscript-access-string.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "subscript-access-string.js"
     ],
-    "sha1": "5fb1a0314101669d4cfd005c86d42e20fe86d7c9",
+    "sha1": "f483d493e7d184b2abc8b3b5bbb94516cbcf1ea8",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fa043ac413c9b7b75a82168891b6d00eee678b92"
+    "sha2": "202aad86228801eccbea88b9a22b7101e52b84cd"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-string-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "subscript-access-string.js"
     ],
-    "sha1": "fa043ac413c9b7b75a82168891b6d00eee678b92",
+    "sha1": "202aad86228801eccbea88b9a22b7101e52b84cd",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "08a7b1b79627d5ecf2f6c2a44d1c2096d659e096"
+    "sha2": "2b4e963009e0805155e8676535b223c62c879101"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-string-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "subscript-access-string.js"
     ],
-    "sha1": "08a7b1b79627d5ecf2f6c2a44d1c2096d659e096",
+    "sha1": "2b4e963009e0805155e8676535b223c62c879101",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f95d1cff9be9bd90156ccd975f57021c1f8eefaa"
+    "sha2": "4c4a65adb50e9c946488410d0d99c75a7ca0133f"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-string-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "subscript-access-string.js"
     ],
-    "sha1": "f95d1cff9be9bd90156ccd975f57021c1f8eefaa",
+    "sha1": "4c4a65adb50e9c946488410d0d99c75a7ca0133f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b9a70f9be8d0f10a65ec1c067062f2cb065a7f4a"
+    "sha2": "2af2672c67860e9e28ab4af97226ee338e870564"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-string-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "subscript-access-string.js"
     ],
-    "sha1": "b9a70f9be8d0f10a65ec1c067062f2cb065a7f4a",
+    "sha1": "2af2672c67860e9e28ab4af97226ee338e870564",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ea9a6faa38a6630a573c055d81b574d5c9bbc033"
+    "sha2": "96da299c379910c222e4a6612fd04c4e377ead89"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-string-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "subscript-access-string.js"
     ],
-    "sha1": "ea9a6faa38a6630a573c055d81b574d5c9bbc033",
+    "sha1": "96da299c379910c222e4a6612fd04c4e377ead89",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f49f652c070f4bf8a8a3950fe588b2e0039e5cc4"
+    "sha2": "333a40a5231326f07242df98da3e1f491e3fd7b6"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-string-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "subscript-access-string.js"
     ],
-    "sha1": "f49f652c070f4bf8a8a3950fe588b2e0039e5cc4",
+    "sha1": "333a40a5231326f07242df98da3e1f491e3fd7b6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b934ce54bbf5097cc87a64591e51df2b0139a940"
+    "sha2": "8e1ab74ded046f8a838698f50c8027fc157c1bbd"
 }]
diff --git a/test/corpus/diff-summaries/javascript/subscript-access-variable.json b/test/corpus/diff-summaries/javascript/subscript-access-variable.json
index fc22498b5..b4b0458c0 100644
--- a/test/corpus/diff-summaries/javascript/subscript-access-variable.json
+++ b/test/corpus/diff-summaries/javascript/subscript-access-variable.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "subscript-access-variable.js"
     ],
-    "sha1": "35771d9839083e28344a82ab572b45449680ab65",
+    "sha1": "3b53388ef7c50bc82b0b59abb8d45214aef3fa42",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "dfbfa45cf724b9a16226e8d0410e91ccb69cbbe3"
+    "sha2": "5beb7e8b3c401a72f4f5a60f85f5227013a04558"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-variable-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "subscript-access-variable.js"
     ],
-    "sha1": "dfbfa45cf724b9a16226e8d0410e91ccb69cbbe3",
+    "sha1": "5beb7e8b3c401a72f4f5a60f85f5227013a04558",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c853b9ef85feb46622a4d7a24542a26e1ceea602"
+    "sha2": "5bcb353bb2493c5a5371c0daab186164024320e6"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-variable-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "subscript-access-variable.js"
     ],
-    "sha1": "c853b9ef85feb46622a4d7a24542a26e1ceea602",
+    "sha1": "5bcb353bb2493c5a5371c0daab186164024320e6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8c7964617fa9ed63c35663da54e463e1cedebc87"
+    "sha2": "835b0eee5ce71154bf5b6b16afd15f25c2c30c37"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-variable-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "subscript-access-variable.js"
     ],
-    "sha1": "8c7964617fa9ed63c35663da54e463e1cedebc87",
+    "sha1": "835b0eee5ce71154bf5b6b16afd15f25c2c30c37",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1743980c0a2d957e974333f4a7fe7be2aee103b4"
+    "sha2": "067ae478f927ebaf358079e575a20c9cc06f12df"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-variable-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "subscript-access-variable.js"
     ],
-    "sha1": "1743980c0a2d957e974333f4a7fe7be2aee103b4",
+    "sha1": "067ae478f927ebaf358079e575a20c9cc06f12df",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "cfd54e85a90ff88f76612bf060a9cc2f917f5648"
+    "sha2": "9cc8cc113808cf76fc069132ae411f65d3dcd6be"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-variable-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "subscript-access-variable.js"
     ],
-    "sha1": "cfd54e85a90ff88f76612bf060a9cc2f917f5648",
+    "sha1": "9cc8cc113808cf76fc069132ae411f65d3dcd6be",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "58c32b6f0cb4ee41b2486ed0c4a08c4b7bb91d5b"
+    "sha2": "40e9ad58642ed82aefb249cc75e3bc9ee24538ce"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-variable-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "subscript-access-variable.js"
     ],
-    "sha1": "58c32b6f0cb4ee41b2486ed0c4a08c4b7bb91d5b",
+    "sha1": "40e9ad58642ed82aefb249cc75e3bc9ee24538ce",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "07ef5da0087fbbef26cc63b4629a9c05e919a68b"
+    "sha2": "59e784e98184a462a8c4df788841596b2536b526"
 }]
diff --git a/test/corpus/diff-summaries/javascript/switch-statement.json b/test/corpus/diff-summaries/javascript/switch-statement.json
index 3191eaa76..4f7bbded3 100644
--- a/test/corpus/diff-summaries/javascript/switch-statement.json
+++ b/test/corpus/diff-summaries/javascript/switch-statement.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "switch-statement.js"
     ],
-    "sha1": "d30e43ec820b535d256a20ed0964fba95c8764b3",
+    "sha1": "076fea1967bae90620dbf93ebac5c503c0535430",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6f28b051550ecf618c5ec1fc4109a47787a4da9c"
+    "sha2": "bceec8ace8d08d61cc2505eab569f93f25771a9b"
 }
 ,{
     "testCaseDescription": "javascript-switch-statement-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "switch-statement.js"
     ],
-    "sha1": "6f28b051550ecf618c5ec1fc4109a47787a4da9c",
+    "sha1": "bceec8ace8d08d61cc2505eab569f93f25771a9b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c7bbc680850439b171c5c39a1dbb8bf3f4b258f1"
+    "sha2": "a0116a52c86a3666ba5ce197dac2ec8fbafdb7f4"
 }
 ,{
     "testCaseDescription": "javascript-switch-statement-delete-insert-test",
@@ -141,9 +141,9 @@
     "filePaths": [
         "switch-statement.js"
     ],
-    "sha1": "c7bbc680850439b171c5c39a1dbb8bf3f4b258f1",
+    "sha1": "a0116a52c86a3666ba5ce197dac2ec8fbafdb7f4",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e1abf04722dcc2abc2e741e80c3d9c5bbaf94ab6"
+    "sha2": "8e12da6cef6b1a528e01a5ab822d3bac7d20b177"
 }
 ,{
     "testCaseDescription": "javascript-switch-statement-replacement-test",
@@ -211,9 +211,9 @@
     "filePaths": [
         "switch-statement.js"
     ],
-    "sha1": "e1abf04722dcc2abc2e741e80c3d9c5bbaf94ab6",
+    "sha1": "8e12da6cef6b1a528e01a5ab822d3bac7d20b177",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f3d3fb5a9daeccf22d32dbcf79e3e6db7e00ac2e"
+    "sha2": "48bd4bb36885c72446ca3fffc6e0951519094bf8"
 }
 ,{
     "testCaseDescription": "javascript-switch-statement-delete-replacement-test",
@@ -272,9 +272,9 @@
     "filePaths": [
         "switch-statement.js"
     ],
-    "sha1": "f3d3fb5a9daeccf22d32dbcf79e3e6db7e00ac2e",
+    "sha1": "48bd4bb36885c72446ca3fffc6e0951519094bf8",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "033f48b1db9de57690d1e8008aabb6435eb33732"
+    "sha2": "5da4b33098b94b59addf89e3cb86029d6bc1d9d6"
 }
 ,{
     "testCaseDescription": "javascript-switch-statement-delete-test",
@@ -303,9 +303,9 @@
     "filePaths": [
         "switch-statement.js"
     ],
-    "sha1": "033f48b1db9de57690d1e8008aabb6435eb33732",
+    "sha1": "5da4b33098b94b59addf89e3cb86029d6bc1d9d6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "cf1d8915d86aa7b40cc64d3a1b48e4633a034465"
+    "sha2": "69a9e89ce1d0e3c6b3dbe2cb259c5088f647ad40"
 }
 ,{
     "testCaseDescription": "javascript-switch-statement-delete-rest-test",
@@ -334,7 +334,7 @@
     "filePaths": [
         "switch-statement.js"
     ],
-    "sha1": "cf1d8915d86aa7b40cc64d3a1b48e4633a034465",
+    "sha1": "69a9e89ce1d0e3c6b3dbe2cb259c5088f647ad40",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "e34cec33423018aab0fa290f745d2dcb89c93f0f"
+    "sha2": "4aa9c3f917064a9005d8cc0a7902ca47fccccd92"
 }]
diff --git a/test/corpus/diff-summaries/javascript/template-string.json b/test/corpus/diff-summaries/javascript/template-string.json
index ec22725e1..abe9690b0 100644
--- a/test/corpus/diff-summaries/javascript/template-string.json
+++ b/test/corpus/diff-summaries/javascript/template-string.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "template-string.js"
     ],
-    "sha1": "eac947afc7bc887c4b69523c4a6f77983a183edb",
+    "sha1": "38227e86fa1e1935004b715a65aa4a9663a83a67",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "950c2afcd03ac3b200b4f8b9a9aec3817648b04b"
+    "sha2": "7a86dff0eae01c85a7bd9946b859ae5ba23f71ab"
 }
 ,{
     "testCaseDescription": "javascript-template-string-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "template-string.js"
     ],
-    "sha1": "950c2afcd03ac3b200b4f8b9a9aec3817648b04b",
+    "sha1": "7a86dff0eae01c85a7bd9946b859ae5ba23f71ab",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "accc809e8ce1122d8b6151774c1fd769309c8e0f"
+    "sha2": "27adb135630151f3a42121200fd498ad54b024d9"
 }
 ,{
     "testCaseDescription": "javascript-template-string-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "template-string.js"
     ],
-    "sha1": "accc809e8ce1122d8b6151774c1fd769309c8e0f",
+    "sha1": "27adb135630151f3a42121200fd498ad54b024d9",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8737d021e9a9a63b61b17a1a18feb0e56dd25833"
+    "sha2": "b7e95d9d02a6cbe1a104f074c5d535c8af6d7b3c"
 }
 ,{
     "testCaseDescription": "javascript-template-string-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "template-string.js"
     ],
-    "sha1": "8737d021e9a9a63b61b17a1a18feb0e56dd25833",
+    "sha1": "b7e95d9d02a6cbe1a104f074c5d535c8af6d7b3c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7b2f1a9735c2c7e49481be1f7ca76a4d265adaa1"
+    "sha2": "50a35440a454554cc19adfe1062b8f756b666ae2"
 }
 ,{
     "testCaseDescription": "javascript-template-string-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "template-string.js"
     ],
-    "sha1": "7b2f1a9735c2c7e49481be1f7ca76a4d265adaa1",
+    "sha1": "50a35440a454554cc19adfe1062b8f756b666ae2",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "897d45ce3ce2e3abebd4f6c51f50ed8f3677b3bd"
+    "sha2": "46f4bcf3028e4a41e3a049ed707f1878d9ad4243"
 }
 ,{
     "testCaseDescription": "javascript-template-string-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "template-string.js"
     ],
-    "sha1": "897d45ce3ce2e3abebd4f6c51f50ed8f3677b3bd",
+    "sha1": "46f4bcf3028e4a41e3a049ed707f1878d9ad4243",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6fb06ea1442e30240106f1f36d59bd06ab2edb1f"
+    "sha2": "5a1e95bd9846c399e28d79db0afb0efc525a4f38"
 }
 ,{
     "testCaseDescription": "javascript-template-string-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "template-string.js"
     ],
-    "sha1": "6fb06ea1442e30240106f1f36d59bd06ab2edb1f",
+    "sha1": "5a1e95bd9846c399e28d79db0afb0efc525a4f38",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8df53a54c07fb78bfcd4ee6537e27adcb642531f"
+    "sha2": "0a65c532acea5d845e6f7d6e3680933203f2b409"
 }]
diff --git a/test/corpus/diff-summaries/javascript/ternary.json b/test/corpus/diff-summaries/javascript/ternary.json
index e613139d9..ac7d2c43e 100644
--- a/test/corpus/diff-summaries/javascript/ternary.json
+++ b/test/corpus/diff-summaries/javascript/ternary.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "ternary.js"
     ],
-    "sha1": "b5446feffd11ca904e2726a11bbc705545843599",
+    "sha1": "9431204c1086df90ad8d2d8209b039e0b07e59bb",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4fbda1abcb8e30b6210e9bca5816014b7eff3407"
+    "sha2": "c36c6a4038eb0ed81fc91ce9a7d3b6e97287b984"
 }
 ,{
     "testCaseDescription": "javascript-ternary-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "ternary.js"
     ],
-    "sha1": "4fbda1abcb8e30b6210e9bca5816014b7eff3407",
+    "sha1": "c36c6a4038eb0ed81fc91ce9a7d3b6e97287b984",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5a36618a7c9b673f065008726471679618abb60a"
+    "sha2": "742148d1dd2101ea4c077c1586dd255478aad4b3"
 }
 ,{
     "testCaseDescription": "javascript-ternary-delete-insert-test",
@@ -117,9 +117,9 @@
     "filePaths": [
         "ternary.js"
     ],
-    "sha1": "5a36618a7c9b673f065008726471679618abb60a",
+    "sha1": "742148d1dd2101ea4c077c1586dd255478aad4b3",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7ac6d0565373cc2cf7e3aa3bdf51754c636b678d"
+    "sha2": "982f93e2fbd02bcb27b508bbd857d221668c2a81"
 }
 ,{
     "testCaseDescription": "javascript-ternary-replacement-test",
@@ -163,9 +163,9 @@
     "filePaths": [
         "ternary.js"
     ],
-    "sha1": "7ac6d0565373cc2cf7e3aa3bdf51754c636b678d",
+    "sha1": "982f93e2fbd02bcb27b508bbd857d221668c2a81",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "90230dd8f3982615b5a2f7d9c96f7ebe6ef91a5a"
+    "sha2": "d0dcf5e99e65965c37ff6805433d1e828b9d04e2"
 }
 ,{
     "testCaseDescription": "javascript-ternary-delete-replacement-test",
@@ -224,9 +224,9 @@
     "filePaths": [
         "ternary.js"
     ],
-    "sha1": "90230dd8f3982615b5a2f7d9c96f7ebe6ef91a5a",
+    "sha1": "d0dcf5e99e65965c37ff6805433d1e828b9d04e2",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7a926ee6d785e921b0253f556626ab7b2faa0d27"
+    "sha2": "a8d6b811cc567f6a87e3ba70f23d8011e5cdc165"
 }
 ,{
     "testCaseDescription": "javascript-ternary-delete-test",
@@ -255,9 +255,9 @@
     "filePaths": [
         "ternary.js"
     ],
-    "sha1": "7a926ee6d785e921b0253f556626ab7b2faa0d27",
+    "sha1": "a8d6b811cc567f6a87e3ba70f23d8011e5cdc165",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "88c0457d70f6e468e3c6fc7ba3982a31c57d80dc"
+    "sha2": "c90571716eb71b61e6ba7827ef50ba43027ab47d"
 }
 ,{
     "testCaseDescription": "javascript-ternary-delete-rest-test",
@@ -286,7 +286,7 @@
     "filePaths": [
         "ternary.js"
     ],
-    "sha1": "88c0457d70f6e468e3c6fc7ba3982a31c57d80dc",
+    "sha1": "c90571716eb71b61e6ba7827ef50ba43027ab47d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9fd6bf4586ccb3910de1ff443d7928bce68977cb"
+    "sha2": "ad1d042f9177c3bf35c1417bcd583f4f7833345e"
 }]
diff --git a/test/corpus/diff-summaries/javascript/this-expression.json b/test/corpus/diff-summaries/javascript/this-expression.json
index ec2a91ba3..230f1f1e0 100644
--- a/test/corpus/diff-summaries/javascript/this-expression.json
+++ b/test/corpus/diff-summaries/javascript/this-expression.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "this-expression.js"
     ],
-    "sha1": "6a44e531842b97c2a60eb0fb38c57fe35035cf16",
+    "sha1": "860cb9c7871e770e1fc6e83d0c168ae726714af5",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "915f0a11edc274872a8147949183e8b07c9fad4b"
+    "sha2": "10c8b2b7402e4fa25f2b83e11eca79b6a46e8e23"
 }
 ,{
     "testCaseDescription": "javascript-this-expression-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "this-expression.js"
     ],
-    "sha1": "915f0a11edc274872a8147949183e8b07c9fad4b",
+    "sha1": "10c8b2b7402e4fa25f2b83e11eca79b6a46e8e23",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "adb919fd11be97d945483b00e4d2f37856e483b6"
+    "sha2": "a8876353eb57ad529412a87e82d67c500fd35eab"
 }
 ,{
     "testCaseDescription": "javascript-this-expression-delete-insert-test",
@@ -117,9 +117,9 @@
     "filePaths": [
         "this-expression.js"
     ],
-    "sha1": "adb919fd11be97d945483b00e4d2f37856e483b6",
+    "sha1": "a8876353eb57ad529412a87e82d67c500fd35eab",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "877ee8b57e204cd9e3569f3adaad096ec8a970dd"
+    "sha2": "ce51ccc60f44cd4bc70ffd2dbdd186be1740aaff"
 }
 ,{
     "testCaseDescription": "javascript-this-expression-replacement-test",
@@ -163,9 +163,9 @@
     "filePaths": [
         "this-expression.js"
     ],
-    "sha1": "877ee8b57e204cd9e3569f3adaad096ec8a970dd",
+    "sha1": "ce51ccc60f44cd4bc70ffd2dbdd186be1740aaff",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2a193071c5327473bc0e781d94e32a64495884eb"
+    "sha2": "4dbb62ad6fdd3ca8486744dbcd6b4d0352806ad2"
 }
 ,{
     "testCaseDescription": "javascript-this-expression-delete-replacement-test",
@@ -224,9 +224,9 @@
     "filePaths": [
         "this-expression.js"
     ],
-    "sha1": "2a193071c5327473bc0e781d94e32a64495884eb",
+    "sha1": "4dbb62ad6fdd3ca8486744dbcd6b4d0352806ad2",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "916921ca606d1206fa980e030ed31cd87966e946"
+    "sha2": "e93ceff9ecf27bb3985cf530acd2f399e6cb9ddd"
 }
 ,{
     "testCaseDescription": "javascript-this-expression-delete-test",
@@ -255,9 +255,9 @@
     "filePaths": [
         "this-expression.js"
     ],
-    "sha1": "916921ca606d1206fa980e030ed31cd87966e946",
+    "sha1": "e93ceff9ecf27bb3985cf530acd2f399e6cb9ddd",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ccf1e1fa57208cdefeb650390c4153ba13d60b23"
+    "sha2": "79103ec5296d3e6f336bdd0c5e8675048af382fc"
 }
 ,{
     "testCaseDescription": "javascript-this-expression-delete-rest-test",
@@ -286,7 +286,7 @@
     "filePaths": [
         "this-expression.js"
     ],
-    "sha1": "ccf1e1fa57208cdefeb650390c4153ba13d60b23",
+    "sha1": "79103ec5296d3e6f336bdd0c5e8675048af382fc",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "027732543c3974844a2f660a3ee74c0837a5b055"
+    "sha2": "31e1acfdb52d290013f5992ae937cfbb571b4662"
 }]
diff --git a/test/corpus/diff-summaries/javascript/throw-statement.json b/test/corpus/diff-summaries/javascript/throw-statement.json
index 4f3c6e7e5..7cf8ebd33 100644
--- a/test/corpus/diff-summaries/javascript/throw-statement.json
+++ b/test/corpus/diff-summaries/javascript/throw-statement.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "throw-statement.js"
     ],
-    "sha1": "04ac626daa098bf596f572115ce36f8cf31b84df",
+    "sha1": "d3dbe75466e3c3716ca9d520e029309694bd7e0f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6504a2a9d3f565d5812bbd79e02f53609761fe92"
+    "sha2": "bccb0fed951a74ea27d14f0a4b99ac432cd63e45"
 }
 ,{
     "testCaseDescription": "javascript-throw-statement-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "throw-statement.js"
     ],
-    "sha1": "6504a2a9d3f565d5812bbd79e02f53609761fe92",
+    "sha1": "bccb0fed951a74ea27d14f0a4b99ac432cd63e45",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5ea11da0cbfa31b113fe4c0c26a1949a6a2d12bd"
+    "sha2": "153aff336c7f06fb1e735c544ba04d90679f4c4b"
 }
 ,{
     "testCaseDescription": "javascript-throw-statement-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "throw-statement.js"
     ],
-    "sha1": "5ea11da0cbfa31b113fe4c0c26a1949a6a2d12bd",
+    "sha1": "153aff336c7f06fb1e735c544ba04d90679f4c4b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "47633d9af7926f59a4a8555688683cc43c055266"
+    "sha2": "3dc7dd4418d81a94f639d1bd582db95f5a1db4b6"
 }
 ,{
     "testCaseDescription": "javascript-throw-statement-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "throw-statement.js"
     ],
-    "sha1": "47633d9af7926f59a4a8555688683cc43c055266",
+    "sha1": "3dc7dd4418d81a94f639d1bd582db95f5a1db4b6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4e39f432c9e0d8a9f126b91f7ea54d21822c7c04"
+    "sha2": "ea01a83ea2565efbe3c35f64bb08ffaeffdf3e3f"
 }
 ,{
     "testCaseDescription": "javascript-throw-statement-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "throw-statement.js"
     ],
-    "sha1": "4e39f432c9e0d8a9f126b91f7ea54d21822c7c04",
+    "sha1": "ea01a83ea2565efbe3c35f64bb08ffaeffdf3e3f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "09ebd0d64a6252d651e35cf07c181750d7b1da40"
+    "sha2": "04da5f6fa1ff7bae95240c22374204ead61ccf57"
 }
 ,{
     "testCaseDescription": "javascript-throw-statement-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "throw-statement.js"
     ],
-    "sha1": "09ebd0d64a6252d651e35cf07c181750d7b1da40",
+    "sha1": "04da5f6fa1ff7bae95240c22374204ead61ccf57",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4da8a2dd13d1b62a139f102cf2d13ce0cf6f3bb7"
+    "sha2": "ef9286df3d5e5e1d6cf58ece9c6179a21c03abde"
 }
 ,{
     "testCaseDescription": "javascript-throw-statement-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "throw-statement.js"
     ],
-    "sha1": "4da8a2dd13d1b62a139f102cf2d13ce0cf6f3bb7",
+    "sha1": "ef9286df3d5e5e1d6cf58ece9c6179a21c03abde",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5c30863954c846e6487626965891f282d42e6b84"
+    "sha2": "5a55532f61fa788629770f9aa8b32d164b64dff1"
 }]
diff --git a/test/corpus/diff-summaries/javascript/true.json b/test/corpus/diff-summaries/javascript/true.json
index 16f71d4a7..b60287bd7 100644
--- a/test/corpus/diff-summaries/javascript/true.json
+++ b/test/corpus/diff-summaries/javascript/true.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "true.js"
     ],
-    "sha1": "f6baf27a65896e7e502d6ec646cb3cbbd7e206f6",
+    "sha1": "9fdf0daa0d51f1d93b8081812fedf78c495d749b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5091492afacae27e07b10a11965b4b5338f092c8"
+    "sha2": "0758bb212201d8ea93779409d931067fb42871f9"
 }
 ,{
     "testCaseDescription": "javascript-true-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "true.js"
     ],
-    "sha1": "5091492afacae27e07b10a11965b4b5338f092c8",
+    "sha1": "0758bb212201d8ea93779409d931067fb42871f9",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3bbd68f2e51402ce75780e5af72c03512991d95b"
+    "sha2": "6dbbd3a30e68e5a6bbcee1cf16e705d6398048b8"
 }
 ,{
     "testCaseDescription": "javascript-true-delete-insert-test",
@@ -117,9 +117,9 @@
     "filePaths": [
         "true.js"
     ],
-    "sha1": "3bbd68f2e51402ce75780e5af72c03512991d95b",
+    "sha1": "6dbbd3a30e68e5a6bbcee1cf16e705d6398048b8",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "12760109620d0e2aebc964bf10793a9018a7a993"
+    "sha2": "83cb074ffb3f72d69f94661fb0c7db3033005fc8"
 }
 ,{
     "testCaseDescription": "javascript-true-replacement-test",
@@ -163,9 +163,9 @@
     "filePaths": [
         "true.js"
     ],
-    "sha1": "12760109620d0e2aebc964bf10793a9018a7a993",
+    "sha1": "83cb074ffb3f72d69f94661fb0c7db3033005fc8",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "6b269c9b079a987453884c3d4f894bfb4e76be70"
+    "sha2": "f3cabf3b0d2f4e47134a977f02800b8b4a15c94d"
 }
 ,{
     "testCaseDescription": "javascript-true-delete-replacement-test",
@@ -224,9 +224,9 @@
     "filePaths": [
         "true.js"
     ],
-    "sha1": "6b269c9b079a987453884c3d4f894bfb4e76be70",
+    "sha1": "f3cabf3b0d2f4e47134a977f02800b8b4a15c94d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0fe461d1797041345efd7168414a5d143c47a0b8"
+    "sha2": "918ea3d4bf6519d29d17b52c6819ea6625c788d1"
 }
 ,{
     "testCaseDescription": "javascript-true-delete-test",
@@ -255,9 +255,9 @@
     "filePaths": [
         "true.js"
     ],
-    "sha1": "0fe461d1797041345efd7168414a5d143c47a0b8",
+    "sha1": "918ea3d4bf6519d29d17b52c6819ea6625c788d1",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f6239893bd02de6e0a7e7f5ef678ad2421d0719e"
+    "sha2": "53f0ecb3c211fa2c0926482c3307a92282b30f01"
 }
 ,{
     "testCaseDescription": "javascript-true-delete-rest-test",
@@ -286,7 +286,7 @@
     "filePaths": [
         "true.js"
     ],
-    "sha1": "f6239893bd02de6e0a7e7f5ef678ad2421d0719e",
+    "sha1": "53f0ecb3c211fa2c0926482c3307a92282b30f01",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b5f63d0fc82f7a027e684d209d08915d0b2bf95c"
+    "sha2": "8c417c7d92df1932f0d0c6ecb4f04d6af528cd83"
 }]
diff --git a/test/corpus/diff-summaries/javascript/try-statement.json b/test/corpus/diff-summaries/javascript/try-statement.json
index 0e883c3d6..2a8814f88 100644
--- a/test/corpus/diff-summaries/javascript/try-statement.json
+++ b/test/corpus/diff-summaries/javascript/try-statement.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "try-statement.js"
     ],
-    "sha1": "b908a6724f0ad01f8801ea57866f313307e6b319",
+    "sha1": "d79608cfe1272202b6e0b9bfffbdb440bca6f4f0",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "d3adba31d9e7e79d07e703ad2a6967562b220f6b"
+    "sha2": "f8ccdd0989f82920cc193e5af94fad3f630c0f4b"
 }
 ,{
     "testCaseDescription": "javascript-try-statement-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "try-statement.js"
     ],
-    "sha1": "d3adba31d9e7e79d07e703ad2a6967562b220f6b",
+    "sha1": "f8ccdd0989f82920cc193e5af94fad3f630c0f4b",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c1fc74cb0f5db63aee48f72adcd8abccccbc931c"
+    "sha2": "01881879cc961f66880f3b655ee215729e926e06"
 }
 ,{
     "testCaseDescription": "javascript-try-statement-delete-insert-test",
@@ -141,9 +141,9 @@
     "filePaths": [
         "try-statement.js"
     ],
-    "sha1": "c1fc74cb0f5db63aee48f72adcd8abccccbc931c",
+    "sha1": "01881879cc961f66880f3b655ee215729e926e06",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "18a5e0f40787e268714e8c7bd3e1641d76d78319"
+    "sha2": "ef3a720f2e23c6fdb4ce7ac4da026deb4e4d3032"
 }
 ,{
     "testCaseDescription": "javascript-try-statement-replacement-test",
@@ -211,9 +211,9 @@
     "filePaths": [
         "try-statement.js"
     ],
-    "sha1": "18a5e0f40787e268714e8c7bd3e1641d76d78319",
+    "sha1": "ef3a720f2e23c6fdb4ce7ac4da026deb4e4d3032",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f836874a0d43f61e721d253cf3f97fd0a83cb6e7"
+    "sha2": "e6c885d35982c0bfffe3b616b1f0ecdeae1b0668"
 }
 ,{
     "testCaseDescription": "javascript-try-statement-delete-replacement-test",
@@ -272,9 +272,9 @@
     "filePaths": [
         "try-statement.js"
     ],
-    "sha1": "f836874a0d43f61e721d253cf3f97fd0a83cb6e7",
+    "sha1": "e6c885d35982c0bfffe3b616b1f0ecdeae1b0668",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "8776c024182abad3bb3f5f68e999e1172fd0bce0"
+    "sha2": "6e631925e9e0fe56294351885ef8fc5aac65cbb1"
 }
 ,{
     "testCaseDescription": "javascript-try-statement-delete-test",
@@ -303,9 +303,9 @@
     "filePaths": [
         "try-statement.js"
     ],
-    "sha1": "8776c024182abad3bb3f5f68e999e1172fd0bce0",
+    "sha1": "6e631925e9e0fe56294351885ef8fc5aac65cbb1",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fb43fddce814a12e5f3a96d13a6a533ea965218c"
+    "sha2": "0f0e9abb8f7462b6a4166add869d011dcc66828e"
 }
 ,{
     "testCaseDescription": "javascript-try-statement-delete-rest-test",
@@ -334,7 +334,7 @@
     "filePaths": [
         "try-statement.js"
     ],
-    "sha1": "fb43fddce814a12e5f3a96d13a6a533ea965218c",
+    "sha1": "0f0e9abb8f7462b6a4166add869d011dcc66828e",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f03ea63f2c081eb44cc3094034c2320fa50f8520"
+    "sha2": "8608f7de8bde13ebf3f39fb99ef1de41c325c4c1"
 }]
diff --git a/test/corpus/diff-summaries/javascript/type-operator.json b/test/corpus/diff-summaries/javascript/type-operator.json
index 393dfdf21..49b1682aa 100644
--- a/test/corpus/diff-summaries/javascript/type-operator.json
+++ b/test/corpus/diff-summaries/javascript/type-operator.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "type-operator.js"
     ],
-    "sha1": "6eeb048dd356c28a76842bafe0ff471aca4fc709",
+    "sha1": "8e35527d1fcc50ec3af6d43b0bd122a32d026e57",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ae302058d381bfe2242f8af75707d16d9bc5f9c6"
+    "sha2": "47135fc22ae0b2656f2359c81785ba2c5432eea2"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "type-operator.js"
     ],
-    "sha1": "ae302058d381bfe2242f8af75707d16d9bc5f9c6",
+    "sha1": "47135fc22ae0b2656f2359c81785ba2c5432eea2",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "70ff969d615bb1e12f9c83a34430c4eecf5e1423"
+    "sha2": "d17cd2231dac3c973cd254731ca8af917f7c6593"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-delete-insert-test",
@@ -102,9 +102,9 @@
     "filePaths": [
         "type-operator.js"
     ],
-    "sha1": "70ff969d615bb1e12f9c83a34430c4eecf5e1423",
+    "sha1": "d17cd2231dac3c973cd254731ca8af917f7c6593",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4e7d94a429cfea4cfb43bee17420bdf2cf31857e"
+    "sha2": "f51303321657a1901c80a9dde5ce7b815afe8e19"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-replacement-test",
@@ -133,9 +133,9 @@
     "filePaths": [
         "type-operator.js"
     ],
-    "sha1": "4e7d94a429cfea4cfb43bee17420bdf2cf31857e",
+    "sha1": "f51303321657a1901c80a9dde5ce7b815afe8e19",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5f0e7b153777bb043786fa66aee9e38978d66762"
+    "sha2": "42cb2729125582f37fa737bbf344dfedbdb54d24"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-delete-replacement-test",
@@ -194,9 +194,9 @@
     "filePaths": [
         "type-operator.js"
     ],
-    "sha1": "5f0e7b153777bb043786fa66aee9e38978d66762",
+    "sha1": "42cb2729125582f37fa737bbf344dfedbdb54d24",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9aaacd568854471edc874364923b43b5a65f6caf"
+    "sha2": "b3786db3e58c470f88b84995f2c91061f59a6fa6"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-delete-test",
@@ -225,9 +225,9 @@
     "filePaths": [
         "type-operator.js"
     ],
-    "sha1": "9aaacd568854471edc874364923b43b5a65f6caf",
+    "sha1": "b3786db3e58c470f88b84995f2c91061f59a6fa6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b91ec6770bb9eed6aa7f9a0b24c65d6460ba825d"
+    "sha2": "27eb013946bfdac1f7c879e1942e1fefba9e0fd7"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-delete-rest-test",
@@ -256,7 +256,7 @@
     "filePaths": [
         "type-operator.js"
     ],
-    "sha1": "b91ec6770bb9eed6aa7f9a0b24c65d6460ba825d",
+    "sha1": "27eb013946bfdac1f7c879e1942e1fefba9e0fd7",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1d96325511c74b433e0a9c675a1e9c1a368bf222"
+    "sha2": "c051c4ee5eae84857816635e04e31257edebcb5c"
 }]
diff --git a/test/corpus/diff-summaries/javascript/undefined.json b/test/corpus/diff-summaries/javascript/undefined.json
index c9627a4d5..3d65aefd5 100644
--- a/test/corpus/diff-summaries/javascript/undefined.json
+++ b/test/corpus/diff-summaries/javascript/undefined.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "undefined.js"
     ],
-    "sha1": "49e91b55ab4d34df9d10e18a357ecb3f9129d38b",
+    "sha1": "d1f9f66616cb4a8e5241389d06175b44b64ac34e",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "670251c94df41dfcbe8b26ad37cf7b723051a348"
+    "sha2": "f1d82202f39a6474fcd21dcce3b6dfa7e5eb8241"
 }
 ,{
     "testCaseDescription": "javascript-undefined-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "undefined.js"
     ],
-    "sha1": "670251c94df41dfcbe8b26ad37cf7b723051a348",
+    "sha1": "f1d82202f39a6474fcd21dcce3b6dfa7e5eb8241",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "1cc3532b64f1b7f19e3676f8625a2b12cfe2630b"
+    "sha2": "ffadb3955439f59fc36a3a4e46027699cdb6bbf6"
 }
 ,{
     "testCaseDescription": "javascript-undefined-delete-insert-test",
@@ -117,9 +117,9 @@
     "filePaths": [
         "undefined.js"
     ],
-    "sha1": "1cc3532b64f1b7f19e3676f8625a2b12cfe2630b",
+    "sha1": "ffadb3955439f59fc36a3a4e46027699cdb6bbf6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "db10576ffb9656dcaaba5532089eb76acf5d489f"
+    "sha2": "6d5665499b7ab5a2b5928bb1ebdfb8d7b51a761a"
 }
 ,{
     "testCaseDescription": "javascript-undefined-replacement-test",
@@ -163,9 +163,9 @@
     "filePaths": [
         "undefined.js"
     ],
-    "sha1": "db10576ffb9656dcaaba5532089eb76acf5d489f",
+    "sha1": "6d5665499b7ab5a2b5928bb1ebdfb8d7b51a761a",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fd6f48b2d37f71c4e9155b4fe875371543a92961"
+    "sha2": "318ae612dc2c5ead78e99c7ba9c78372e2aa7e00"
 }
 ,{
     "testCaseDescription": "javascript-undefined-delete-replacement-test",
@@ -224,9 +224,9 @@
     "filePaths": [
         "undefined.js"
     ],
-    "sha1": "fd6f48b2d37f71c4e9155b4fe875371543a92961",
+    "sha1": "318ae612dc2c5ead78e99c7ba9c78372e2aa7e00",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "5a182f3d30775c47d619dea99fb6912f14460f86"
+    "sha2": "1cbcfcfae2b90be186b40019af33d72521396c6a"
 }
 ,{
     "testCaseDescription": "javascript-undefined-delete-test",
@@ -255,9 +255,9 @@
     "filePaths": [
         "undefined.js"
     ],
-    "sha1": "5a182f3d30775c47d619dea99fb6912f14460f86",
+    "sha1": "1cbcfcfae2b90be186b40019af33d72521396c6a",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "58439f1bf80a8b82fae2f08eb8bfc1d1a96c4a7e"
+    "sha2": "5b9e963ccd55870fb96ee313b0bdec69073c06f3"
 }
 ,{
     "testCaseDescription": "javascript-undefined-delete-rest-test",
@@ -286,7 +286,7 @@
     "filePaths": [
         "undefined.js"
     ],
-    "sha1": "58439f1bf80a8b82fae2f08eb8bfc1d1a96c4a7e",
+    "sha1": "5b9e963ccd55870fb96ee313b0bdec69073c06f3",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a36b31965536bd78704978e111fd017722054b27"
+    "sha2": "12cb94a07b939e328b608f766261bfc889387a1c"
 }]
diff --git a/test/corpus/diff-summaries/javascript/var-declaration.json b/test/corpus/diff-summaries/javascript/var-declaration.json
index 29b9620b4..a75091899 100644
--- a/test/corpus/diff-summaries/javascript/var-declaration.json
+++ b/test/corpus/diff-summaries/javascript/var-declaration.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "var-declaration.js"
     ],
-    "sha1": "6f8397f676d372fb7cc681c6170eab3f00a5508b",
+    "sha1": "b30d9733ca169b25a427010999b3dd8c9be551da",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a0b5c84fbb211d943917ca1b033d0f4d69e99fab"
+    "sha2": "a5875f3eac5696fabc1e6f2075fd4b3e4acf80f6"
 }
 ,{
     "testCaseDescription": "javascript-var-declaration-replacement-insert-test",
@@ -101,9 +101,9 @@
     "filePaths": [
         "var-declaration.js"
     ],
-    "sha1": "a0b5c84fbb211d943917ca1b033d0f4d69e99fab",
+    "sha1": "a5875f3eac5696fabc1e6f2075fd4b3e4acf80f6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b29aa1c8b4ce011908b5fcb146722a7415615b61"
+    "sha2": "e561c08c0a23b3e07124c647bb5d04e77bb95133"
 }
 ,{
     "testCaseDescription": "javascript-var-declaration-delete-insert-test",
@@ -174,9 +174,9 @@
     "filePaths": [
         "var-declaration.js"
     ],
-    "sha1": "b29aa1c8b4ce011908b5fcb146722a7415615b61",
+    "sha1": "e561c08c0a23b3e07124c647bb5d04e77bb95133",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "121898865a4153fdee7af490b7f95e63dfecd245"
+    "sha2": "70560ef2eba8ebbf67ee1531287a88ea68072f04"
 }
 ,{
     "testCaseDescription": "javascript-var-declaration-replacement-test",
@@ -247,9 +247,9 @@
     "filePaths": [
         "var-declaration.js"
     ],
-    "sha1": "121898865a4153fdee7af490b7f95e63dfecd245",
+    "sha1": "70560ef2eba8ebbf67ee1531287a88ea68072f04",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "4f800595767d306adf1001a3e532c0f49c77549b"
+    "sha2": "0abbd988947419a0c88783cdc98f77d359e35103"
 }
 ,{
     "testCaseDescription": "javascript-var-declaration-delete-replacement-test",
@@ -368,9 +368,9 @@
     "filePaths": [
         "var-declaration.js"
     ],
-    "sha1": "4f800595767d306adf1001a3e532c0f49c77549b",
+    "sha1": "0abbd988947419a0c88783cdc98f77d359e35103",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a62c5f0ceea3f103315aab7f595f0fc257690f46"
+    "sha2": "234930d69997f4b38ee6c757c3bbf5d5de3dee95"
 }
 ,{
     "testCaseDescription": "javascript-var-declaration-delete-test",
@@ -399,9 +399,9 @@
     "filePaths": [
         "var-declaration.js"
     ],
-    "sha1": "a62c5f0ceea3f103315aab7f595f0fc257690f46",
+    "sha1": "234930d69997f4b38ee6c757c3bbf5d5de3dee95",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a1ce7a96169c9034dbc16807e754c5a58df0c0f8"
+    "sha2": "0c611ad50b5a33882625b46921a258fecafe4338"
 }
 ,{
     "testCaseDescription": "javascript-var-declaration-delete-rest-test",
@@ -460,7 +460,7 @@
     "filePaths": [
         "var-declaration.js"
     ],
-    "sha1": "a1ce7a96169c9034dbc16807e754c5a58df0c0f8",
+    "sha1": "0c611ad50b5a33882625b46921a258fecafe4338",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "538d0fcee9f9f1163338901d5c7ec3035da370c4"
+    "sha2": "29d84149fb0ba58feac034446ef2a26ef13ebbe7"
 }]
diff --git a/test/corpus/diff-summaries/javascript/variable.json b/test/corpus/diff-summaries/javascript/variable.json
index 4ac3183d8..247c1e351 100644
--- a/test/corpus/diff-summaries/javascript/variable.json
+++ b/test/corpus/diff-summaries/javascript/variable.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "variable.js"
     ],
-    "sha1": "af7fa2faefa291b9a06977c18ce312bffe7bc871",
+    "sha1": "19decacdfae8c915beac36516e5d5163aa337bbb",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "60d7f50440d1afcabab62927fc575f4aa29cbac7"
+    "sha2": "0f2549ac5f04c4c069243d5f5acd34a59a87792a"
 }
 ,{
     "testCaseDescription": "javascript-variable-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "variable.js"
     ],
-    "sha1": "60d7f50440d1afcabab62927fc575f4aa29cbac7",
+    "sha1": "0f2549ac5f04c4c069243d5f5acd34a59a87792a",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "fb6bdcb35d721efd2efc359911854cdd2834eece"
+    "sha2": "511f2d68b55b58a0a7bc7971fd7e187424323ec9"
 }
 ,{
     "testCaseDescription": "javascript-variable-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "variable.js"
     ],
-    "sha1": "fb6bdcb35d721efd2efc359911854cdd2834eece",
+    "sha1": "511f2d68b55b58a0a7bc7971fd7e187424323ec9",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b49f639a28f9a64cb9c8994eb626c0353b3b8d34"
+    "sha2": "b7d77afa5fc24eee42a3186c6c07930f6d648b8c"
 }
 ,{
     "testCaseDescription": "javascript-variable-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "variable.js"
     ],
-    "sha1": "b49f639a28f9a64cb9c8994eb626c0353b3b8d34",
+    "sha1": "b7d77afa5fc24eee42a3186c6c07930f6d648b8c",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "26355d52a696edb7b9cc3fd119c6f5fd6afdd24c"
+    "sha2": "ffebc8ca576e0ed4dd45e2b8a04bffeeed9bcaa3"
 }
 ,{
     "testCaseDescription": "javascript-variable-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "variable.js"
     ],
-    "sha1": "26355d52a696edb7b9cc3fd119c6f5fd6afdd24c",
+    "sha1": "ffebc8ca576e0ed4dd45e2b8a04bffeeed9bcaa3",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "c7eb7e72c8e57e95670f442f9a1129a19a4864bd"
+    "sha2": "a4fbc5631230e1d35e2087e2a22378ef8cd183f4"
 }
 ,{
     "testCaseDescription": "javascript-variable-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "variable.js"
     ],
-    "sha1": "c7eb7e72c8e57e95670f442f9a1129a19a4864bd",
+    "sha1": "a4fbc5631230e1d35e2087e2a22378ef8cd183f4",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "3d7a287fb605880675b46eba44ecfaab86e8ba35"
+    "sha2": "b90f9276ffab24e1a416ae983dfc3d80958bfbf3"
 }
 ,{
     "testCaseDescription": "javascript-variable-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "variable.js"
     ],
-    "sha1": "3d7a287fb605880675b46eba44ecfaab86e8ba35",
+    "sha1": "b90f9276ffab24e1a416ae983dfc3d80958bfbf3",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "7ad1f0f1e9c4fda88ae65caff85d855f6b429c0f"
+    "sha2": "482c6b4a3d148a1044307d404fb6b885282052ec"
 }]
diff --git a/test/corpus/diff-summaries/javascript/void-operator.json b/test/corpus/diff-summaries/javascript/void-operator.json
index b9b993da2..24dfc5aa1 100644
--- a/test/corpus/diff-summaries/javascript/void-operator.json
+++ b/test/corpus/diff-summaries/javascript/void-operator.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "void-operator.js"
     ],
-    "sha1": "7ba29898c7f45897e7de7f1191e0c6b7f9fac35e",
+    "sha1": "2ef908eb8362a24fa21d03181f3fad53ae0ed2e6",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "04efcf66ddcaa70558821725988f42c1af11f3cc"
+    "sha2": "a7da11fd29ed977124bc1bcd1e8edf0cb0456fa8"
 }
 ,{
     "testCaseDescription": "javascript-void-operator-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "void-operator.js"
     ],
-    "sha1": "04efcf66ddcaa70558821725988f42c1af11f3cc",
+    "sha1": "a7da11fd29ed977124bc1bcd1e8edf0cb0456fa8",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "2cfcfeb87a2b4a0db7905bc74d3a7e1be38cbf5a"
+    "sha2": "3155eb265726741ef7ea018261e532edb17defd5"
 }
 ,{
     "testCaseDescription": "javascript-void-operator-delete-insert-test",
@@ -114,9 +114,9 @@
     "filePaths": [
         "void-operator.js"
     ],
-    "sha1": "2cfcfeb87a2b4a0db7905bc74d3a7e1be38cbf5a",
+    "sha1": "3155eb265726741ef7ea018261e532edb17defd5",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "cd22e88db42b827ae56fb6ca9edeb221c67f038d"
+    "sha2": "a8e07058f492f66066dfbd8d196cc52917ace1e9"
 }
 ,{
     "testCaseDescription": "javascript-void-operator-replacement-test",
@@ -157,9 +157,9 @@
     "filePaths": [
         "void-operator.js"
     ],
-    "sha1": "cd22e88db42b827ae56fb6ca9edeb221c67f038d",
+    "sha1": "a8e07058f492f66066dfbd8d196cc52917ace1e9",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0b81ec59795d14187d78eb1f48b8b5e8acb0c748"
+    "sha2": "f704d6ca27541c9b8540bc78daa65ab50a07df55"
 }
 ,{
     "testCaseDescription": "javascript-void-operator-delete-replacement-test",
@@ -218,9 +218,9 @@
     "filePaths": [
         "void-operator.js"
     ],
-    "sha1": "0b81ec59795d14187d78eb1f48b8b5e8acb0c748",
+    "sha1": "f704d6ca27541c9b8540bc78daa65ab50a07df55",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "9860d6a2ad25819e82ac0848010b5d6f7e1b5b76"
+    "sha2": "6d2b373f0f1535e9bc855eb31fe3c4fe7de67291"
 }
 ,{
     "testCaseDescription": "javascript-void-operator-delete-test",
@@ -249,9 +249,9 @@
     "filePaths": [
         "void-operator.js"
     ],
-    "sha1": "9860d6a2ad25819e82ac0848010b5d6f7e1b5b76",
+    "sha1": "6d2b373f0f1535e9bc855eb31fe3c4fe7de67291",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "df7dcb8b1dbc8cd8d7044c0ea75c825e95f55279"
+    "sha2": "4d4be52e10c1523f9f75dc7baf81bfd7f14f22ac"
 }
 ,{
     "testCaseDescription": "javascript-void-operator-delete-rest-test",
@@ -280,7 +280,7 @@
     "filePaths": [
         "void-operator.js"
     ],
-    "sha1": "df7dcb8b1dbc8cd8d7044c0ea75c825e95f55279",
+    "sha1": "4d4be52e10c1523f9f75dc7baf81bfd7f14f22ac",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "85ef535e2b1570133c3be4bddaffc8513555ad2c"
+    "sha2": "050bf3c35f520a7b4d475a9e05bca5f37320e6f2"
 }]
diff --git a/test/corpus/diff-summaries/javascript/while-statement.json b/test/corpus/diff-summaries/javascript/while-statement.json
index 9b990e54c..198598af7 100644
--- a/test/corpus/diff-summaries/javascript/while-statement.json
+++ b/test/corpus/diff-summaries/javascript/while-statement.json
@@ -25,9 +25,9 @@
     "filePaths": [
         "while-statement.js"
     ],
-    "sha1": "1476b59a288eafecf5ddd48696a3e207754a9668",
+    "sha1": "b5f4de2fd04e2d89e31c73e9242473dcebe2adf2",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "f23284bfe8af3aeae4cd0de9ff318f5c0bb1117a"
+    "sha2": "5a88d6c7e4251805e734534cb0cd9175d2f882c5"
 }
 ,{
     "testCaseDescription": "javascript-while-statement-replacement-insert-test",
@@ -71,9 +71,9 @@
     "filePaths": [
         "while-statement.js"
     ],
-    "sha1": "f23284bfe8af3aeae4cd0de9ff318f5c0bb1117a",
+    "sha1": "5a88d6c7e4251805e734534cb0cd9175d2f882c5",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "0187cf96aade757c54df567264bce2b15c5d2bde"
+    "sha2": "6070f35c9195e3ea5f1bc20b242a3b0fbfb5b4cf"
 }
 ,{
     "testCaseDescription": "javascript-while-statement-delete-insert-test",
@@ -141,9 +141,9 @@
     "filePaths": [
         "while-statement.js"
     ],
-    "sha1": "0187cf96aade757c54df567264bce2b15c5d2bde",
+    "sha1": "6070f35c9195e3ea5f1bc20b242a3b0fbfb5b4cf",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ea3cd5cf3a270d94a6fb64540f5d15c3a862d7db"
+    "sha2": "0f7d7c851f70e9cf12da79c1f375d74d7c86346d"
 }
 ,{
     "testCaseDescription": "javascript-while-statement-replacement-test",
@@ -211,9 +211,9 @@
     "filePaths": [
         "while-statement.js"
     ],
-    "sha1": "ea3cd5cf3a270d94a6fb64540f5d15c3a862d7db",
+    "sha1": "0f7d7c851f70e9cf12da79c1f375d74d7c86346d",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "201605c6796eb154347d09577ba30c428ff8a2fe"
+    "sha2": "64f2c7aa26145bb76dfa49e91c0f076405a7e587"
 }
 ,{
     "testCaseDescription": "javascript-while-statement-delete-replacement-test",
@@ -272,9 +272,9 @@
     "filePaths": [
         "while-statement.js"
     ],
-    "sha1": "201605c6796eb154347d09577ba30c428ff8a2fe",
+    "sha1": "64f2c7aa26145bb76dfa49e91c0f076405a7e587",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "b6a9d4096d663c0a0095d75e9ceb4dacf5bbee39"
+    "sha2": "a77c3e65d95b8360c99a2338ad9087a6f5e73536"
 }
 ,{
     "testCaseDescription": "javascript-while-statement-delete-test",
@@ -303,9 +303,9 @@
     "filePaths": [
         "while-statement.js"
     ],
-    "sha1": "b6a9d4096d663c0a0095d75e9ceb4dacf5bbee39",
+    "sha1": "a77c3e65d95b8360c99a2338ad9087a6f5e73536",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "a82434bad4b9b59f0d6df675bc4fadfa97b992b4"
+    "sha2": "123bdc4d0063e95990c66e4dfab8e5ce651b092f"
 }
 ,{
     "testCaseDescription": "javascript-while-statement-delete-rest-test",
@@ -334,7 +334,7 @@
     "filePaths": [
         "while-statement.js"
     ],
-    "sha1": "a82434bad4b9b59f0d6df675bc4fadfa97b992b4",
+    "sha1": "123bdc4d0063e95990c66e4dfab8e5ce651b092f",
     "gitDir": "test/corpus/repos/javascript",
-    "sha2": "ff624cef881f79c1f5e43043657a490eb7d137e2"
+    "sha2": "5537b4f4f11d7b3adf39afc4f0f0e89ead4c5afe"
 }]
diff --git a/test/corpus/repos/javascript b/test/corpus/repos/javascript
index 0fcaa2c97..ca8fc61f3 160000
--- a/test/corpus/repos/javascript
+++ b/test/corpus/repos/javascript
@@ -1 +1 @@
-Subproject commit 0fcaa2c972c37d8b90d03e71ec04376f26c8ef22
+Subproject commit ca8fc61f30b2437915b4089b9317d8e0f85cd279
diff --git a/vendor/hspec-expectations-pretty-diff b/vendor/hspec-expectations-pretty-diff
new file mode 160000
index 000000000..8762cd516
--- /dev/null
+++ b/vendor/hspec-expectations-pretty-diff
@@ -0,0 +1 @@
+Subproject commit 8762cd516394091b20f8b7e041e3ca29bd3aec90