diff --git a/languages/javascript/vendor/tree-sitter-javascript b/languages/javascript/vendor/tree-sitter-javascript
index 86f36ec10..0f31f33d8 160000
--- a/languages/javascript/vendor/tree-sitter-javascript
+++ b/languages/javascript/vendor/tree-sitter-javascript
@@ -1 +1 @@
-Subproject commit 86f36ec109e8b75363b3683b390d3e059fd7e7d9
+Subproject commit 0f31f33d83387bef48176ced5a8a9c3419f28f62
diff --git a/src/Language.hs b/src/Language.hs
index df2e28703..abffe15e7 100644
--- a/src/Language.hs
+++ b/src/Language.hs
@@ -40,6 +40,11 @@ languageForType mediaType = case mediaType of
     ".go" -> Just Language.Go
     _ -> Nothing
 
+toVarDeclOrAssignment :: (HasField fields Category) => Term (S.Syntax Text) (Record fields) -> Term (S.Syntax Text) (Record fields)
+toVarDeclOrAssignment child = case unwrap child of
+  S.Indexed [child', assignment] -> cofree $ setCategory (extract child) VarAssignment :< S.VarAssignment child' assignment
+  _ -> cofree $ setCategory (extract child) VarDecl :< S.VarDecl child Nothing
+
 toVarDecl :: (HasField fields Category) => Term (S.Syntax Text) (Record fields) -> Term (S.Syntax Text) (Record fields)
 toVarDecl child = cofree $ setCategory (extract child) VarDecl :< S.VarDecl child Nothing
 
diff --git a/src/Language/JavaScript.hs b/src/Language/JavaScript.hs
index 665220b28..a43b06345 100644
--- a/src/Language/JavaScript.hs
+++ b/src/Language/JavaScript.hs
@@ -27,8 +27,7 @@ termAssignment _ category children
       -> Just $ S.MethodCall target method (toList . unwrap =<< args)
     (FunctionCall, function : args) -> Just $ S.FunctionCall function (toList . unwrap =<< args)
     (Ternary, condition : cases) -> Just $ S.Ternary condition cases
-    (VarAssignment, [ x, y ]) -> Just $ S.VarAssignment x y
-    (VarDecl, _) -> Just . S.Indexed $ toVarDecl <$> children
+    (VarDecl, _) -> Just . S.Indexed $ toVarDeclOrAssignment <$> children
     (Object, _) -> Just . S.Object Nothing $ foldMap toTuple children
     (DoWhile, [ expr, body ]) -> Just $ S.DoWhile expr body
     (Constructor, [ expr ]) -> Just $ S.Constructor expr
@@ -112,9 +111,8 @@ categoryForJavaScriptProductionName name = case name of
   "subscript_access" -> SubscriptAccess
   "regex" -> Regex
   "template_string" -> TemplateString
-  "var_assignment" -> VarAssignment
-  "var_declaration" -> VarDecl
-  "trailing_var_declaration" -> VarDecl
+  "variable_declaration" -> VarDecl
+  "trailing_variable_declaration" -> VarDecl
   "switch_statement" -> Switch
   "math_assignment" -> MathAssignment
   "case" -> Case
diff --git a/test/corpus/diff-summaries/javascript/anonymous-function.json b/test/corpus/diff-summaries/javascript/anonymous-function.json
index 1e7bd14a2..0f4430283 100644
--- a/test/corpus/diff-summaries/javascript/anonymous-function.json
+++ b/test/corpus/diff-summaries/javascript/anonymous-function.json
@@ -34,7 +34,7 @@
         "+function(a,b) { return a + b; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "784daea9abe5781b5fb045bca826f00e058b0b62..79dfd6679e3715440ef3b7fe5659c2e95b464e0a"
+    "shas": "b08e38bcc1fe2b06ba9591e2ecf24e8bbc0686b6..129d3b4c5f96c2a47285565c7d027beb8e97aa75"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-replacement-insert-test",
@@ -89,7 +89,7 @@
         " function(a,b) { return a + b; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "79dfd6679e3715440ef3b7fe5659c2e95b464e0a..ad67bdb5c28dfa7bffb3b351b18bf4063fde4368"
+    "shas": "129d3b4c5f96c2a47285565c7d027beb8e97aa75..7ddd8785d6e38cad56d16ed74d198fec656089b0"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-insert-test",
@@ -196,7 +196,7 @@
         " function(a,b) { return a + b; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ad67bdb5c28dfa7bffb3b351b18bf4063fde4368..0311df3923d36634ac774ecd6c6c075095da4caa"
+    "shas": "7ddd8785d6e38cad56d16ed74d198fec656089b0..4c312a59a025f5c94062fadafe07acb45f933136"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-replacement-test",
@@ -303,7 +303,7 @@
         " function(a,b) { return a + b; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0311df3923d36634ac774ecd6c6c075095da4caa..cfbe9b7d7304d2d7e48008f6dcfc45b46f220ae8"
+    "shas": "4c312a59a025f5c94062fadafe07acb45f933136..c5dcab169edaa3ba486b292325a6b234760add52"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-replacement-test",
@@ -374,7 +374,7 @@
         "+function(b,c) { return b * c; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cfbe9b7d7304d2d7e48008f6dcfc45b46f220ae8..3adabffe21f16f14d22321a15cdc94375a4bc8d4"
+    "shas": "c5dcab169edaa3ba486b292325a6b234760add52..92c048e16249b06d26f273d860f99d5e1e721898"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-test",
@@ -413,7 +413,7 @@
         " function(b,c) { return b * c; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3adabffe21f16f14d22321a15cdc94375a4bc8d4..c12493823be244170a3cbcfee3a58d73bbd3792e"
+    "shas": "92c048e16249b06d26f273d860f99d5e1e721898..92aa67dcc98d7cff48630de21b2ae90e23016864"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-function-delete-rest-test",
@@ -451,5 +451,5 @@
         "-function(b,c) { return b * c; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c12493823be244170a3cbcfee3a58d73bbd3792e..971e80e1ed44f9f8b2609def8c1084ff18aae4d8"
+    "shas": "92aa67dcc98d7cff48630de21b2ae90e23016864..0e4c9734db1c092af9f580c47577a13276fd2d63"
 }]
diff --git a/test/corpus/diff-summaries/javascript/anonymous-parameterless-function.json b/test/corpus/diff-summaries/javascript/anonymous-parameterless-function.json
index 6f932bdda..fbcb9c139 100644
--- a/test/corpus/diff-summaries/javascript/anonymous-parameterless-function.json
+++ b/test/corpus/diff-summaries/javascript/anonymous-parameterless-function.json
@@ -34,7 +34,7 @@
         "+function() { return 'hi'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "971e80e1ed44f9f8b2609def8c1084ff18aae4d8..0ecac91d871ce1710e1e882cdafae6b8144d1093"
+    "shas": "0e4c9734db1c092af9f580c47577a13276fd2d63..1478dafa4540a58004a1bc6fe4bf7f6b7016fc49"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-replacement-insert-test",
@@ -89,7 +89,7 @@
         " function() { return 'hi'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0ecac91d871ce1710e1e882cdafae6b8144d1093..aabf2599d13baffc37c37aeae922e9e0cab9321e"
+    "shas": "1478dafa4540a58004a1bc6fe4bf7f6b7016fc49..9a961f711a4722fde5ea906361a211f1459898e7"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-insert-test",
@@ -142,7 +142,7 @@
         " function() { return 'hi'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "aabf2599d13baffc37c37aeae922e9e0cab9321e..e35377e1ae05ef1ef6b199f0b8cdf397ffc35728"
+    "shas": "9a961f711a4722fde5ea906361a211f1459898e7..4d15ceddf7ed4656ebf9e546241987bc060c140d"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-replacement-test",
@@ -195,7 +195,7 @@
         " function() { return 'hi'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e35377e1ae05ef1ef6b199f0b8cdf397ffc35728..7c0deab8c4fb4b24af8ab03441af40715f70e777"
+    "shas": "4d15ceddf7ed4656ebf9e546241987bc060c140d..fb664180676f7986ca24ac5d5d971b50926ff142"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+function() { return 'hello'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7c0deab8c4fb4b24af8ab03441af40715f70e777..32102fd7e3e055358fa5f861e83107b9bf48d242"
+    "shas": "fb664180676f7986ca24ac5d5d971b50926ff142..5c6a962b790676d66ca6c64cfb22ca8f30c4e7cd"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-test",
@@ -305,7 +305,7 @@
         " function() { return 'hello'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "32102fd7e3e055358fa5f861e83107b9bf48d242..35cdc685b60c7e9cd845b37a4511f72ecf607a11"
+    "shas": "5c6a962b790676d66ca6c64cfb22ca8f30c4e7cd..15da20d28acd6abc6d8426e8aef3a0b5303efe65"
 }
 ,{
     "testCaseDescription": "javascript-anonymous-parameterless-function-delete-rest-test",
@@ -343,5 +343,5 @@
         "-function() { return 'hello'; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "35cdc685b60c7e9cd845b37a4511f72ecf607a11..4dbddbfa6c4e016d944aa6ee8ef1acfb4be38af8"
+    "shas": "15da20d28acd6abc6d8426e8aef3a0b5303efe65..000409c2e911d6dfdeffbe87b32d1740473d1424"
 }]
diff --git a/test/corpus/diff-summaries/javascript/array.json b/test/corpus/diff-summaries/javascript/array.json
index c2823b47e..2af5e7b9c 100644
--- a/test/corpus/diff-summaries/javascript/array.json
+++ b/test/corpus/diff-summaries/javascript/array.json
@@ -34,7 +34,7 @@
         "+[ \"item1\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2bd27e99860858d0a524b5a307b97f412b4cc0c8..c5f2cfdf12cc04125dd63da617842503c567c5fd"
+    "shas": "254469e126d04bef42017691cd2ae61c3c504471..670f160d10666224e22aae55bd8e4818d9e6ac79"
 }
 ,{
     "testCaseDescription": "javascript-array-replacement-insert-test",
@@ -89,7 +89,7 @@
         " [ \"item1\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c5f2cfdf12cc04125dd63da617842503c567c5fd..f25bd893c412fed4c8ec5ff56c9e97336ebfa3e3"
+    "shas": "670f160d10666224e22aae55bd8e4818d9e6ac79..9c3f74d4722f9b71926881a177c51b6ecf0c0b1e"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-insert-test",
@@ -130,7 +130,7 @@
         " [ \"item1\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f25bd893c412fed4c8ec5ff56c9e97336ebfa3e3..e90ef017de2604896fd5252cf50abfae42a2de65"
+    "shas": "9c3f74d4722f9b71926881a177c51b6ecf0c0b1e..c383e7992378764d6b3aee436060569cdfc607e4"
 }
 ,{
     "testCaseDescription": "javascript-array-replacement-test",
@@ -171,7 +171,7 @@
         " [ \"item1\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e90ef017de2604896fd5252cf50abfae42a2de65..12aafb64072ed2e4f9e5ed53596077e121dcb3f8"
+    "shas": "c383e7992378764d6b3aee436060569cdfc607e4..c010cde8590b022ef8a24f4cc1c549c9add91684"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-replacement-test",
@@ -242,7 +242,7 @@
         "+[ \"item1\", \"item2\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "12aafb64072ed2e4f9e5ed53596077e121dcb3f8..b2226b56fac04d4cc961dd282b818e008e742836"
+    "shas": "c010cde8590b022ef8a24f4cc1c549c9add91684..84bb3f8207324432decff2fed4309553b1035492"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-test",
@@ -281,7 +281,7 @@
         " [ \"item1\", \"item2\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b2226b56fac04d4cc961dd282b818e008e742836..0c0547039a1aea4a4501be30ff4f29a4d02a11c7"
+    "shas": "84bb3f8207324432decff2fed4309553b1035492..c1f1d4f8ac9cd0510d4fc6b90f6761f76894d581"
 }
 ,{
     "testCaseDescription": "javascript-array-delete-rest-test",
@@ -319,5 +319,5 @@
         "-[ \"item1\", \"item2\" ];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0c0547039a1aea4a4501be30ff4f29a4d02a11c7..790803fdb50f5b52531a5fd1dc0573fd2b036126"
+    "shas": "c1f1d4f8ac9cd0510d4fc6b90f6761f76894d581..2be4c53970c1476bbb354be878424d6aec954c3b"
 }]
diff --git a/test/corpus/diff-summaries/javascript/arrow-function.json b/test/corpus/diff-summaries/javascript/arrow-function.json
index a7e453013..aa13fd27f 100644
--- a/test/corpus/diff-summaries/javascript/arrow-function.json
+++ b/test/corpus/diff-summaries/javascript/arrow-function.json
@@ -34,7 +34,7 @@
         "+(f, g) => { return h; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "42d2564cba025ea67f19ffdd328b554aa2aede8b..8b26d17bccd77a6adc09be5f4f6925211d49f608"
+    "shas": "3db5e012ed131477f930a3f737f9f525618c5e14..6a63b65f961a294b571c238184f7c34daec739e6"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-replacement-insert-test",
@@ -89,7 +89,7 @@
         " (f, g) => { return h; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8b26d17bccd77a6adc09be5f4f6925211d49f608..26b2bb5c170fa68dcde0a45330c61cf3b86aa481"
+    "shas": "6a63b65f961a294b571c238184f7c34daec739e6..702a81b029e71195108ffa88cd86cc0cb8a0bfc0"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-insert-test",
@@ -142,7 +142,7 @@
         " (f, g) => { return h; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "26b2bb5c170fa68dcde0a45330c61cf3b86aa481..88cf4316918c8cbf307d3f35021088ba4f00cb48"
+    "shas": "702a81b029e71195108ffa88cd86cc0cb8a0bfc0..a24d1deb73b7af18a6c225d96549b590596f169f"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-replacement-test",
@@ -195,7 +195,7 @@
         " (f, g) => { return h; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "88cf4316918c8cbf307d3f35021088ba4f00cb48..d48fb117156de30732546f9bc5ad9cbd05504069"
+    "shas": "a24d1deb73b7af18a6c225d96549b590596f169f..75e113c5abb973a7a9ec9466a2282bece2e96909"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+(f, g) => { return g; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d48fb117156de30732546f9bc5ad9cbd05504069..beb073e32c22aa0cba1502e259619ca5dbcc2484"
+    "shas": "75e113c5abb973a7a9ec9466a2282bece2e96909..a814aa38486e618d9e7fb057bb85b09d3ec74f82"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-test",
@@ -305,7 +305,7 @@
         " (f, g) => { return g; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "beb073e32c22aa0cba1502e259619ca5dbcc2484..8dd01eee1e30aeb73b7ef44206565ecb24b71dde"
+    "shas": "a814aa38486e618d9e7fb057bb85b09d3ec74f82..ddbacd0eb735177ab19205ae3505ba26d186b799"
 }
 ,{
     "testCaseDescription": "javascript-arrow-function-delete-rest-test",
@@ -343,5 +343,5 @@
         "-(f, g) => { return g; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8dd01eee1e30aeb73b7ef44206565ecb24b71dde..39852cdd4b70a1926580629f96ee4221841afb76"
+    "shas": "ddbacd0eb735177ab19205ae3505ba26d186b799..d8102af2a206032f1800de2be9ffff6d65b2efeb"
 }]
diff --git a/test/corpus/diff-summaries/javascript/assignment.json b/test/corpus/diff-summaries/javascript/assignment.json
index a48ad10e8..84bdfda96 100644
--- a/test/corpus/diff-summaries/javascript/assignment.json
+++ b/test/corpus/diff-summaries/javascript/assignment.json
@@ -34,7 +34,7 @@
         "+x = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ae3598b402258260e941e7a876918f8037bf887d..fd7a7b20b42d08ee2f42c5ec5e913fd5fc4c73dc"
+    "shas": "4ef69625070791efda498ad25dd15ea404e80a0a..b9a6308372b5aaf6eabca535ef6158d3ed8fc0e9"
 }
 ,{
     "testCaseDescription": "javascript-assignment-replacement-insert-test",
@@ -89,7 +89,7 @@
         " x = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "fd7a7b20b42d08ee2f42c5ec5e913fd5fc4c73dc..8e6308ced68ef5b841fa40a6534e38dff1b2e5f9"
+    "shas": "b9a6308372b5aaf6eabca535ef6158d3ed8fc0e9..0460e4c7de35b264f7b03db34af368f6d75ae49b"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-insert-test",
@@ -142,7 +142,7 @@
         " x = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8e6308ced68ef5b841fa40a6534e38dff1b2e5f9..2696ad06b794ac91951ad0db11a60a6d9f326b9c"
+    "shas": "0460e4c7de35b264f7b03db34af368f6d75ae49b..c9576ab72226a38fdeb1f1e181722a78903e42eb"
 }
 ,{
     "testCaseDescription": "javascript-assignment-replacement-test",
@@ -195,7 +195,7 @@
         " x = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2696ad06b794ac91951ad0db11a60a6d9f326b9c..0aac1d89f0577d4e374e02b91c8daf4e3a8cb1e6"
+    "shas": "c9576ab72226a38fdeb1f1e181722a78903e42eb..2341b3a2cec8f24d470d53358886e656f66cb0b3"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0aac1d89f0577d4e374e02b91c8daf4e3a8cb1e6..84f1974640b46de51ce2424ef0a34a5aed26a83e"
+    "shas": "2341b3a2cec8f24d470d53358886e656f66cb0b3..67b60a436662860cd1d2d24fe15b2948f639b51c"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-test",
@@ -305,7 +305,7 @@
         " x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "84f1974640b46de51ce2424ef0a34a5aed26a83e..79dde8d0f8db201fd8c3507b2d66f862d34a8ad5"
+    "shas": "67b60a436662860cd1d2d24fe15b2948f639b51c..102b601a22e37cddcd6c6b75339abaf506498cb5"
 }
 ,{
     "testCaseDescription": "javascript-assignment-delete-rest-test",
@@ -343,5 +343,5 @@
         "-x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "79dde8d0f8db201fd8c3507b2d66f862d34a8ad5..02c7c57f6900a26076acb665ba4fc51a55fc79db"
+    "shas": "102b601a22e37cddcd6c6b75339abaf506498cb5..38c5c9b8a781f4e7cc4870b14cf6308c470f3429"
 }]
diff --git a/test/corpus/diff-summaries/javascript/bitwise-operator.json b/test/corpus/diff-summaries/javascript/bitwise-operator.json
index 44f277806..128ee7864 100644
--- a/test/corpus/diff-summaries/javascript/bitwise-operator.json
+++ b/test/corpus/diff-summaries/javascript/bitwise-operator.json
@@ -34,7 +34,7 @@
         "+i >> j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8eb05a7fac3721888570615043a58da2a28e278e..e14d15bff391dc532b49157ab968f48fc0086b54"
+    "shas": "fc97776c88bbf1e3ca3b131c922d52cdd145c310..1499ca92572fbfab835c438a62ac45445273af8d"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-replacement-insert-test",
@@ -89,7 +89,7 @@
         " i >> j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e14d15bff391dc532b49157ab968f48fc0086b54..34fdb106b5c1bb73196a1ee8ecd1c817825cb2f8"
+    "shas": "1499ca92572fbfab835c438a62ac45445273af8d..aa55583127a8e2d320cb0966cb4d1451a25ba4b5"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-insert-test",
@@ -142,7 +142,7 @@
         " i >> j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "34fdb106b5c1bb73196a1ee8ecd1c817825cb2f8..eea256d8297ce7d2bdf17205c8f929819c7c56ec"
+    "shas": "aa55583127a8e2d320cb0966cb4d1451a25ba4b5..af00398d70cb44febe7b557a0e8bb92974ca66fb"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-replacement-test",
@@ -195,7 +195,7 @@
         " i >> j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "eea256d8297ce7d2bdf17205c8f929819c7c56ec..722c71a678e72e79281ce2c0847a09b4a9e5b52c"
+    "shas": "af00398d70cb44febe7b557a0e8bb92974ca66fb..c423472d55b5ab222dd1923c5b1359c06b0d495c"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+i >> k;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "722c71a678e72e79281ce2c0847a09b4a9e5b52c..2dbfa9bdf49e3112341bad6e9fbb2845a70d5a6d"
+    "shas": "c423472d55b5ab222dd1923c5b1359c06b0d495c..755971e5c73b8f1102f7e906704bdb279fa8c66d"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-test",
@@ -305,7 +305,7 @@
         " i >> k;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2dbfa9bdf49e3112341bad6e9fbb2845a70d5a6d..5246a10f3ea2f174a908f8976aaf13cb6a454dc0"
+    "shas": "755971e5c73b8f1102f7e906704bdb279fa8c66d..d467ba370d836e8176d765668b80946ff56de095"
 }
 ,{
     "testCaseDescription": "javascript-bitwise-operator-delete-rest-test",
@@ -343,5 +343,5 @@
         "-i >> k;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5246a10f3ea2f174a908f8976aaf13cb6a454dc0..ef8d4296ee2dfe27245e4697b092bcf81f14acce"
+    "shas": "d467ba370d836e8176d765668b80946ff56de095..389d96d89899599c19ba846b326ad23bd0ebf628"
 }]
diff --git a/test/corpus/diff-summaries/javascript/boolean-operator.json b/test/corpus/diff-summaries/javascript/boolean-operator.json
index 7778c9332..569fe2154 100644
--- a/test/corpus/diff-summaries/javascript/boolean-operator.json
+++ b/test/corpus/diff-summaries/javascript/boolean-operator.json
@@ -34,7 +34,7 @@
         "+i || j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "60e56ee717443319fd06b7b25a02393835ad25e4..0fd3f94bbca77a5e4a4dea4ae5ecc4a7b2a7cf6f"
+    "shas": "3f6c1b75b51ab00da9af216249484caf26091581..b3a7123cfa8717ab1cd8269825fedd198e27716a"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-replacement-insert-test",
@@ -89,7 +89,7 @@
         " i || j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0fd3f94bbca77a5e4a4dea4ae5ecc4a7b2a7cf6f..17f325d11dfa050a157ccf5679cbe1ed270d713e"
+    "shas": "b3a7123cfa8717ab1cd8269825fedd198e27716a..52fd40dee217558ad728eb46617ff6eef9420d2f"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-insert-test",
@@ -142,7 +142,7 @@
         " i || j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "17f325d11dfa050a157ccf5679cbe1ed270d713e..fde9a571269f580178b33b191abe2ad403e3be54"
+    "shas": "52fd40dee217558ad728eb46617ff6eef9420d2f..01acee6cb2acfccc96c1a00efd6f1c42e6dab8b7"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-replacement-test",
@@ -195,7 +195,7 @@
         " i || j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "fde9a571269f580178b33b191abe2ad403e3be54..e6ad1de0a4a9e55334402ff2aff8ececff181c12"
+    "shas": "01acee6cb2acfccc96c1a00efd6f1c42e6dab8b7..132d025f4c04e19cde7d6031e225acbc03e251c2"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+i && j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e6ad1de0a4a9e55334402ff2aff8ececff181c12..5418dc49e7d40c66acafad0ae967c5c9360b8868"
+    "shas": "132d025f4c04e19cde7d6031e225acbc03e251c2..6d6fe2a9fffc08d3340d2781a8e85b854065d744"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-test",
@@ -305,7 +305,7 @@
         " i && j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5418dc49e7d40c66acafad0ae967c5c9360b8868..cd66c224553926eca0160ddbed77db465273bec9"
+    "shas": "6d6fe2a9fffc08d3340d2781a8e85b854065d744..02ec40bd979d702e89a628e0e7c5f279a53af17e"
 }
 ,{
     "testCaseDescription": "javascript-boolean-operator-delete-rest-test",
@@ -343,5 +343,5 @@
         "-i && j;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cd66c224553926eca0160ddbed77db465273bec9..8eb05a7fac3721888570615043a58da2a28e278e"
+    "shas": "02ec40bd979d702e89a628e0e7c5f279a53af17e..fc97776c88bbf1e3ca3b131c922d52cdd145c310"
 }]
diff --git a/test/corpus/diff-summaries/javascript/break.json b/test/corpus/diff-summaries/javascript/break.json
index 7cc825454..6a3e1760e 100644
--- a/test/corpus/diff-summaries/javascript/break.json
+++ b/test/corpus/diff-summaries/javascript/break.json
@@ -34,7 +34,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "689c75b2c901c257422d3759b780fc15b9819a0d..5eb3b30f1a301d6f29f72a5918e0e67dc0bd4e6e"
+    "shas": "9ab4bb09dfbde3a5662c1756a7139a8726a32035..1dfeb3228bb095f82f22289ee66dc313d3183389"
 }
 ,{
     "testCaseDescription": "javascript-break-insert-test",
@@ -88,7 +88,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) { break; }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5eb3b30f1a301d6f29f72a5918e0e67dc0bd4e6e..eb63e35e2ba221a54f60193d95864c6019cb3f85"
+    "shas": "1dfeb3228bb095f82f22289ee66dc313d3183389..2489e31c4c3144e38a9281c58aa8f4c8f80ba608"
 }
 ,{
     "testCaseDescription": "javascript-break-replacement-test",
@@ -142,7 +142,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) { continue; }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "eb63e35e2ba221a54f60193d95864c6019cb3f85..ac199cd2633184c5938b67c680406fc9ef4dbae0"
+    "shas": "2489e31c4c3144e38a9281c58aa8f4c8f80ba608..9d5026a7505cf4df97e5be082148333076715f07"
 }
 ,{
     "testCaseDescription": "javascript-break-delete-replacement-test",
@@ -196,7 +196,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) { break; }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ac199cd2633184c5938b67c680406fc9ef4dbae0..046f6130859081f355b85af2a949770a034c2001"
+    "shas": "9d5026a7505cf4df97e5be082148333076715f07..9037251cac657851027bb652a91f5cbabf062cac"
 }
 ,{
     "testCaseDescription": "javascript-break-delete-insert-test",
@@ -250,7 +250,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "046f6130859081f355b85af2a949770a034c2001..1e56e3767e24a60a8d9516ddf57a4a8d5b291989"
+    "shas": "9037251cac657851027bb652a91f5cbabf062cac..025604923f251a5f1eca403379317f5c69ee5658"
 }
 ,{
     "testCaseDescription": "javascript-break-teardown-test",
@@ -288,5 +288,5 @@
         "-for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1e56e3767e24a60a8d9516ddf57a4a8d5b291989..a6c03f4fe5985c8424ed595bd7d50ecc6098dc8a"
+    "shas": "025604923f251a5f1eca403379317f5c69ee5658..beee7c2b7123a5e4c67865c63ebe928135866f4b"
 }]
diff --git a/test/corpus/diff-summaries/javascript/chained-callbacks.json b/test/corpus/diff-summaries/javascript/chained-callbacks.json
index 1f07283e2..7da018f76 100644
--- a/test/corpus/diff-summaries/javascript/chained-callbacks.json
+++ b/test/corpus/diff-summaries/javascript/chained-callbacks.json
@@ -34,7 +34,7 @@
         "+this.map(function (a) { return a.b; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9d8e6a9365dd210f6592bfbb25de8eb159ea7499..1ac143c91e550a2392ac6cb4724efe0f6c31477b"
+    "shas": "1e602069d5ddaf5c7680a54f3807ea0f50c1397d..5e6180fe2edf6de06e8cde81614fff1a2e3b8109"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-replacement-insert-test",
@@ -89,7 +89,7 @@
         " this.map(function (a) { return a.b; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1ac143c91e550a2392ac6cb4724efe0f6c31477b..f7ab59d2024e14a5260519faa0012ae957547395"
+    "shas": "5e6180fe2edf6de06e8cde81614fff1a2e3b8109..20176385285b829a0d3e1d40913c7adf6689dc26"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-insert-test",
@@ -196,7 +196,7 @@
         " this.map(function (a) { return a.b; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f7ab59d2024e14a5260519faa0012ae957547395..49320cf924ffd18ed8c5dcda326cbf6526f49030"
+    "shas": "20176385285b829a0d3e1d40913c7adf6689dc26..255340514600e343c56b24a9f64ad45aa4fbf0d5"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-replacement-test",
@@ -303,7 +303,7 @@
         " this.map(function (a) { return a.b; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "49320cf924ffd18ed8c5dcda326cbf6526f49030..325ca9645fc4edf757aa30d91a58bd348a5bb43c"
+    "shas": "255340514600e343c56b24a9f64ad45aa4fbf0d5..98dec71fd2b23d0584534d0a4bf930971b997e55"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-replacement-test",
@@ -374,7 +374,7 @@
         "+this.reduce(function (a) { return b.a; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "325ca9645fc4edf757aa30d91a58bd348a5bb43c..191853942041b4c49b5888ccb5fb138c2fcce147"
+    "shas": "98dec71fd2b23d0584534d0a4bf930971b997e55..727a92f861cd52e3c74409c4590c0710e1ba2aa1"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-test",
@@ -413,7 +413,7 @@
         " this.reduce(function (a) { return b.a; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "191853942041b4c49b5888ccb5fb138c2fcce147..4d93f0d28d7c311ebe367c1846ece4937efa0f80"
+    "shas": "727a92f861cd52e3c74409c4590c0710e1ba2aa1..fb57493f88437cf42a77bcbe9cdc0f7fec4760a9"
 }
 ,{
     "testCaseDescription": "javascript-chained-callbacks-delete-rest-test",
@@ -451,5 +451,5 @@
         "-this.reduce(function (a) { return b.a; })"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4d93f0d28d7c311ebe367c1846ece4937efa0f80..c95bd0e01ff1d7d686262b782db20ad959d3676f"
+    "shas": "fb57493f88437cf42a77bcbe9cdc0f7fec4760a9..28f109decac7a1c87036b0de6ddae80ed15ba2a1"
 }]
diff --git a/test/corpus/diff-summaries/javascript/chained-property-access.json b/test/corpus/diff-summaries/javascript/chained-property-access.json
index 0fdc98d6f..eb4191740 100644
--- a/test/corpus/diff-summaries/javascript/chained-property-access.json
+++ b/test/corpus/diff-summaries/javascript/chained-property-access.json
@@ -34,7 +34,7 @@
         "+return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2ceb4d28a0554634451ed82eacdbb44d64ce6d54..04d4c1c2fc7bdc609a5e62f5392deeb2b8c9ab9a"
+    "shas": "789ce31e3d1a7475a43b8d90357fa2732e9e0f2a..e06131d6b7f59a737be755d94d3fe5ec5695be7c"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-replacement-insert-test",
@@ -89,7 +89,7 @@
         " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "04d4c1c2fc7bdc609a5e62f5392deeb2b8c9ab9a..6a9f25a73a687fa568e6d8c0729891567ce577d9"
+    "shas": "e06131d6b7f59a737be755d94d3fe5ec5695be7c..284b668373f6dbc4901b13fddaf2e1c14aa19ac3"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-insert-test",
@@ -169,7 +169,7 @@
         " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6a9f25a73a687fa568e6d8c0729891567ce577d9..f28a31996062be9efdb0201fdb9c31713fb1863c"
+    "shas": "284b668373f6dbc4901b13fddaf2e1c14aa19ac3..9dac7c2b426d6ce48b3f0e3131544e28d1738e18"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-replacement-test",
@@ -249,7 +249,7 @@
         " return returned.promise().done( newDefer.resolve ).fail( newDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f28a31996062be9efdb0201fdb9c31713fb1863c..46c033b24c360e511ef758b6b789094a7fdf0a71"
+    "shas": "9dac7c2b426d6ce48b3f0e3131544e28d1738e18..7e6064e2d36a44f31ca68f628ec894eb716bf7b9"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-replacement-test",
@@ -320,7 +320,7 @@
         "+return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "46c033b24c360e511ef758b6b789094a7fdf0a71..68a9119e612fa94131420134a900676aa832b51c"
+    "shas": "7e6064e2d36a44f31ca68f628ec894eb716bf7b9..fb5e4b62aca7179b890dc4b5e4e93b1a38da8b42"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-test",
@@ -359,7 +359,7 @@
         " return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "68a9119e612fa94131420134a900676aa832b51c..4df47be97cc54a916abb21134f5d8b761e34752a"
+    "shas": "fb5e4b62aca7179b890dc4b5e4e93b1a38da8b42..d69d5b642605a0ae422260b2a9359c58925a6691"
 }
 ,{
     "testCaseDescription": "javascript-chained-property-access-delete-rest-test",
@@ -397,5 +397,5 @@
         "-return returned.promise().done( otherDefer.resolve ).fail( otherDefer.reject )"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4df47be97cc54a916abb21134f5d8b761e34752a..9d8e6a9365dd210f6592bfbb25de8eb159ea7499"
+    "shas": "d69d5b642605a0ae422260b2a9359c58925a6691..1e602069d5ddaf5c7680a54f3807ea0f50c1397d"
 }]
diff --git a/test/corpus/diff-summaries/javascript/class.json b/test/corpus/diff-summaries/javascript/class.json
index 072fdc81f..8aa0ad223 100644
--- a/test/corpus/diff-summaries/javascript/class.json
+++ b/test/corpus/diff-summaries/javascript/class.json
@@ -34,7 +34,7 @@
         "+class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5d563ac383acc3c789fbd552c697d625c0f424fc..f27889edbbb5640de4565ccc6d3dda2c6ca4ff7b"
+    "shas": "44ab56bc4e78762b4754c401e610d9e8da5069d9..edc06f926f7662e0a561b9cc2249b3343e891387"
 }
 ,{
     "testCaseDescription": "javascript-class-replacement-insert-test",
@@ -89,7 +89,7 @@
         " class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f27889edbbb5640de4565ccc6d3dda2c6ca4ff7b..6363c59704fdb865549eb385ba38810a1c53f5f9"
+    "shas": "edc06f926f7662e0a561b9cc2249b3343e891387..43dbe14a7cd7ad9c1702207ce7659e2b7a1c45cf"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-insert-test",
@@ -196,7 +196,7 @@
         " class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6363c59704fdb865549eb385ba38810a1c53f5f9..0193a7dc4d1a24b5344dd31b252d5624bc36e843"
+    "shas": "43dbe14a7cd7ad9c1702207ce7659e2b7a1c45cf..c502ad0ea48e29a52fc17649a80cc9461e1927cd"
 }
 ,{
     "testCaseDescription": "javascript-class-replacement-test",
@@ -303,7 +303,7 @@
         " class Foo { static one(a) { return a; }; two(b) { return b; } three(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0193a7dc4d1a24b5344dd31b252d5624bc36e843..da671e1fcebbc3420fa30b56cb64b32ce271a004"
+    "shas": "c502ad0ea48e29a52fc17649a80cc9461e1927cd..bd3c667c5a9d9405597d2c2b6038d8d937ea4591"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-replacement-test",
@@ -374,7 +374,7 @@
         "+class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "da671e1fcebbc3420fa30b56cb64b32ce271a004..08d69ec53c3b1ea4afe6ffab3084d626bf375015"
+    "shas": "bd3c667c5a9d9405597d2c2b6038d8d937ea4591..1a5efc171f2d7f8f349b1f7d64617f3ae9d97002"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-test",
@@ -413,7 +413,7 @@
         " class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "08d69ec53c3b1ea4afe6ffab3084d626bf375015..b5988452546dcdfce01968a70b4fc10fa86804a9"
+    "shas": "1a5efc171f2d7f8f349b1f7d64617f3ae9d97002..307f479c5cbd91928013cd254c2a31ab6d7f8658"
 }
 ,{
     "testCaseDescription": "javascript-class-delete-rest-test",
@@ -451,5 +451,5 @@
         "-class Foo { static foo(a) { return a; }; bar(b) { return b; } baz(c) { return c; } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b5988452546dcdfce01968a70b4fc10fa86804a9..2bd27e99860858d0a524b5a307b97f412b4cc0c8"
+    "shas": "307f479c5cbd91928013cd254c2a31ab6d7f8658..254469e126d04bef42017691cd2ae61c3c504471"
 }]
diff --git a/test/corpus/diff-summaries/javascript/comma-operator.json b/test/corpus/diff-summaries/javascript/comma-operator.json
index 503b4fc8b..7ac889c8b 100644
--- a/test/corpus/diff-summaries/javascript/comma-operator.json
+++ b/test/corpus/diff-summaries/javascript/comma-operator.json
@@ -49,7 +49,7 @@
         "+a = 1, b = 2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e49b80d7752e9f991ddcb2ff2a8c5f714d9bafa3..14a76b842f749ae817b858b9261f74556d312f2a"
+    "shas": "c746d23108ac9d5c3f3c54c2409565a484b5e709..ec615ca5aa41cefc2848e95f22d42e49cb9e1c2e"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-replacement-insert-test",
@@ -119,7 +119,7 @@
         " a = 1, b = 2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "14a76b842f749ae817b858b9261f74556d312f2a..faf4dcc0d18c6e0183bd5b18ef394ea11149e88a"
+    "shas": "ec615ca5aa41cefc2848e95f22d42e49cb9e1c2e..462a29eab0d5612aa9c0351cea6625da33d511af"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-insert-test",
@@ -190,7 +190,7 @@
         " a = 1, b = 2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "faf4dcc0d18c6e0183bd5b18ef394ea11149e88a..10dc61819ea841e72a63c8eb5b90fbc5deb87cd7"
+    "shas": "462a29eab0d5612aa9c0351cea6625da33d511af..8e441316b923f6c78887f04c9888b0b49c581964"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-replacement-test",
@@ -261,7 +261,7 @@
         " a = 1, b = 2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "10dc61819ea841e72a63c8eb5b90fbc5deb87cd7..abb50392e9b4195a408d8d4a8518009dd057a483"
+    "shas": "8e441316b923f6c78887f04c9888b0b49c581964..36d96085989992f0c2dcdc1086e8416b89114140"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-replacement-test",
@@ -347,7 +347,7 @@
         "+c = {d: (3, 4 + 5, 6)};"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "abb50392e9b4195a408d8d4a8518009dd057a483..878315053fc181a6a17a51d3a39f25b5bbcbfd27"
+    "shas": "36d96085989992f0c2dcdc1086e8416b89114140..c6c0bd59d462b7ff7dee52447c879fc7a9d4913d"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-test",
@@ -401,7 +401,7 @@
         " c = {d: (3, 4 + 5, 6)};"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "878315053fc181a6a17a51d3a39f25b5bbcbfd27..2abca864526a4b0babc92f4b962b97fd0fa369c3"
+    "shas": "c6c0bd59d462b7ff7dee52447c879fc7a9d4913d..09b0762f96a863f6c41d0f0ccab99839da6f4163"
 }
 ,{
     "testCaseDescription": "javascript-comma-operator-delete-rest-test",
@@ -439,5 +439,5 @@
         "-c = {d: (3, 4 + 5, 6)};"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2abca864526a4b0babc92f4b962b97fd0fa369c3..1a9d89c148259dce0124722fcfdce38260c2f1b3"
+    "shas": "09b0762f96a863f6c41d0f0ccab99839da6f4163..89c1e5f6d5f5059a8f03f24bfc240cb8e14819e9"
 }]
diff --git a/test/corpus/diff-summaries/javascript/comment.json b/test/corpus/diff-summaries/javascript/comment.json
index 8ceb0b5ab..823e3aad5 100644
--- a/test/corpus/diff-summaries/javascript/comment.json
+++ b/test/corpus/diff-summaries/javascript/comment.json
@@ -16,7 +16,7 @@
         "+// This is a property"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b2dce4d2365759cf652927b76a86ca88c71cb3ad..db207c620623dc7eb9b820031a15b5aca30b26db"
+    "shas": "4e9add9e716058fa4021b730dad2e7f1fa8ffc7a..daf4b89aef8a8e68a162d238ffd69516f7d43530"
 }
 ,{
     "testCaseDescription": "javascript-comment-replacement-insert-test",
@@ -40,7 +40,7 @@
         " // This is a property"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "db207c620623dc7eb9b820031a15b5aca30b26db..6e90b1a14ba52fdf6a15f7b1556594131a573822"
+    "shas": "daf4b89aef8a8e68a162d238ffd69516f7d43530..a06e4ccea3cb1348786e81617dc133bfb334a0ae"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-insert-test",
@@ -65,7 +65,7 @@
         " // This is a property"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6e90b1a14ba52fdf6a15f7b1556594131a573822..87cf91ddfbb489cc26f9c1a15b99490a5a6dd565"
+    "shas": "a06e4ccea3cb1348786e81617dc133bfb334a0ae..4d2fc90e98a23fb6f1b6beba2ad9d93d6f6da923"
 }
 ,{
     "testCaseDescription": "javascript-comment-replacement-test",
@@ -90,7 +90,7 @@
         " // This is a property"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "87cf91ddfbb489cc26f9c1a15b99490a5a6dd565..7906057920b1f71cf60e233b751b2e7232f8bdec"
+    "shas": "4d2fc90e98a23fb6f1b6beba2ad9d93d6f6da923..9c5c502bafe5cb46c6e6d59fc32e00bfd7462e70"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-replacement-test",
@@ -115,7 +115,7 @@
         "-// This is a property"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7906057920b1f71cf60e233b751b2e7232f8bdec..1a7c0420f710a5888df797396c0b7202c854dcef"
+    "shas": "9c5c502bafe5cb46c6e6d59fc32e00bfd7462e70..254a0da2dac5202acc851ff0ea69a6abfe051806"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-test",
@@ -138,7 +138,7 @@
         " */"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1a7c0420f710a5888df797396c0b7202c854dcef..b82c4beb2b850e567c2e653a9d367a4cb2770d50"
+    "shas": "254a0da2dac5202acc851ff0ea69a6abfe051806..48c6ead82e3b53405443089a2a83a4a760e54375"
 }
 ,{
     "testCaseDescription": "javascript-comment-delete-rest-test",
@@ -160,5 +160,5 @@
         "-*/"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b82c4beb2b850e567c2e653a9d367a4cb2770d50..98e620d7e739bab2841281450b4d879405585f38"
+    "shas": "48c6ead82e3b53405443089a2a83a4a760e54375..0e2317b4ac1337d2e6debeeaa18673924f479fbf"
 }]
diff --git a/test/corpus/diff-summaries/javascript/constructor-call.json b/test/corpus/diff-summaries/javascript/constructor-call.json
index 6fc09c53d..682424e6a 100644
--- a/test/corpus/diff-summaries/javascript/constructor-call.json
+++ b/test/corpus/diff-summaries/javascript/constructor-call.json
@@ -34,7 +34,7 @@
         "+new module.Klass(1, \"two\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "347b15603c28f7232a36d6d312d1c335a4dd39db..f591b107b5e12a6dff7705301800f6f1cf5370dc"
+    "shas": "f51bc6f2b12d9f7a4271606e1d4fcc442eb2688d..1cdcf3fc56a33381b806e928314eaa894778a155"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-replacement-insert-test",
@@ -89,7 +89,7 @@
         " new module.Klass(1, \"two\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f591b107b5e12a6dff7705301800f6f1cf5370dc..dde57ec95cd201fe36288d8f48c50dc36679d1ec"
+    "shas": "1cdcf3fc56a33381b806e928314eaa894778a155..1f8ec3661a147dfd8f761c6510444e36e95612ae"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-insert-test",
@@ -142,7 +142,7 @@
         " new module.Klass(1, \"two\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "dde57ec95cd201fe36288d8f48c50dc36679d1ec..6174629e516abf02b6f7180ff3a0f46ad37e4a44"
+    "shas": "1f8ec3661a147dfd8f761c6510444e36e95612ae..3259c778988ca95c98e568158c71e1c49312474d"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-replacement-test",
@@ -195,7 +195,7 @@
         " new module.Klass(1, \"two\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6174629e516abf02b6f7180ff3a0f46ad37e4a44..65827ded87dfff62bf2f54cd3d1b6b9adde23ac9"
+    "shas": "3259c778988ca95c98e568158c71e1c49312474d..03ce25a4f4b2bd0917093590cc4a2ec684204bf9"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+new module.Klass(1, \"three\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "65827ded87dfff62bf2f54cd3d1b6b9adde23ac9..0d0df9150e59fa45b52ab52b60217b60f708273e"
+    "shas": "03ce25a4f4b2bd0917093590cc4a2ec684204bf9..17f765993c4e7ce431ecec6b695292ef2040dde3"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-test",
@@ -305,7 +305,7 @@
         " new module.Klass(1, \"three\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0d0df9150e59fa45b52ab52b60217b60f708273e..6432a11e84757a4ad67f5b6f2901f11c44fc3f54"
+    "shas": "17f765993c4e7ce431ecec6b695292ef2040dde3..8132e4e372307de86bc7e496108bb796571bebe5"
 }
 ,{
     "testCaseDescription": "javascript-constructor-call-delete-rest-test",
@@ -343,5 +343,5 @@
         "-new module.Klass(1, \"three\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6432a11e84757a4ad67f5b6f2901f11c44fc3f54..0418e8cf18ec4ace51cecc0070ed205313e92ac2"
+    "shas": "8132e4e372307de86bc7e496108bb796571bebe5..d305b2fcb86de85314b4ea7b59cd65ae41e82abd"
 }]
diff --git a/test/corpus/diff-summaries/javascript/continue.json b/test/corpus/diff-summaries/javascript/continue.json
index 190ec0084..efd4904d2 100644
--- a/test/corpus/diff-summaries/javascript/continue.json
+++ b/test/corpus/diff-summaries/javascript/continue.json
@@ -34,7 +34,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a6c03f4fe5985c8424ed595bd7d50ecc6098dc8a..11c2248a6d114e5db88e13af8def8eaa09a09d45"
+    "shas": "beee7c2b7123a5e4c67865c63ebe928135866f4b..2c943b521ead3b54286ea1cd2aac6018c6b81433"
 }
 ,{
     "testCaseDescription": "javascript-continue-insert-test",
@@ -88,7 +88,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) { continue; }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "11c2248a6d114e5db88e13af8def8eaa09a09d45..7ed1007a324c95df70eefc8431845e8b8d52fc8a"
+    "shas": "2c943b521ead3b54286ea1cd2aac6018c6b81433..0a2a2c8ae3bad94b9401b00ff4cf14326a902d81"
 }
 ,{
     "testCaseDescription": "javascript-continue-replacement-test",
@@ -142,7 +142,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) { break; }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7ed1007a324c95df70eefc8431845e8b8d52fc8a..1e73b9b08c68b5f920a4c7e0e7afe2a12241ad63"
+    "shas": "0a2a2c8ae3bad94b9401b00ff4cf14326a902d81..64fbd27c0376c28cfc9a8d901697cb1f15cc1fe3"
 }
 ,{
     "testCaseDescription": "javascript-continue-delete-replacement-test",
@@ -196,7 +196,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) { continue; }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1e73b9b08c68b5f920a4c7e0e7afe2a12241ad63..ff56824c50998e8ccac9e604cd564e4384b817bc"
+    "shas": "64fbd27c0376c28cfc9a8d901697cb1f15cc1fe3..b564db2836439280ab94c39b826d083be444fb08"
 }
 ,{
     "testCaseDescription": "javascript-continue-delete-insert-test",
@@ -250,7 +250,7 @@
         "+for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ff56824c50998e8ccac9e604cd564e4384b817bc..5935d4c1093d472de0d76b9430758ae222d7f39f"
+    "shas": "b564db2836439280ab94c39b826d083be444fb08..01f2fb8d5bd915fbc7790ddff9d40810574074b8"
 }
 ,{
     "testCaseDescription": "javascript-continue-teardown-test",
@@ -288,5 +288,5 @@
         "-for (i = 0; i < 10; i++) { if (i === 4) {  }; i }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5935d4c1093d472de0d76b9430758ae222d7f39f..f270d7e7af308e5cacc3d7334905fd5f2308dc19"
+    "shas": "01f2fb8d5bd915fbc7790ddff9d40810574074b8..65b1dacae919ef819dc69ac3d3f38b19becda862"
 }]
diff --git a/test/corpus/diff-summaries/javascript/delete-operator.json b/test/corpus/diff-summaries/javascript/delete-operator.json
index e1561779f..d6ae49fb1 100644
--- a/test/corpus/diff-summaries/javascript/delete-operator.json
+++ b/test/corpus/diff-summaries/javascript/delete-operator.json
@@ -34,7 +34,7 @@
         "+delete thing['prop'];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b3e70bdf3077d7e2f3dee952ec37081e57641fbf..3ac61d3244121c909b60b90f70722dc6e44ed140"
+    "shas": "cdeef24ab3d20893343df51bad02c05c39b1521c..f8af0983ac4617a5ece85b3b45dc8be59cd4361a"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-replacement-insert-test",
@@ -89,7 +89,7 @@
         " delete thing['prop'];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3ac61d3244121c909b60b90f70722dc6e44ed140..42fbb679ec755bf5bd07495de1e9138e01d8f767"
+    "shas": "f8af0983ac4617a5ece85b3b45dc8be59cd4361a..c5485061705d3c76fbb1a60183018685cce61e0e"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-insert-test",
@@ -142,7 +142,7 @@
         " delete thing['prop'];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "42fbb679ec755bf5bd07495de1e9138e01d8f767..2a9fed1fcaf42fc6fbc8e41621263d780fa28415"
+    "shas": "c5485061705d3c76fbb1a60183018685cce61e0e..31045e5de8259578826122759a4a1822a3f7cdc3"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-replacement-test",
@@ -195,7 +195,7 @@
         " delete thing['prop'];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2a9fed1fcaf42fc6fbc8e41621263d780fa28415..5ae979fee6cf8bb9f63ffaf750398f67d9db2b2c"
+    "shas": "31045e5de8259578826122759a4a1822a3f7cdc3..c65f959cf8f43bcc1aaf6dc61532fc1f4772cc2c"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+delete thing.prop"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5ae979fee6cf8bb9f63ffaf750398f67d9db2b2c..b563e9bd5c771bd02bd66d3db152e29883767d9c"
+    "shas": "c65f959cf8f43bcc1aaf6dc61532fc1f4772cc2c..a202a1786db14c5aa72a798fde8a012331fd57ae"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-test",
@@ -305,7 +305,7 @@
         " delete thing.prop"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b563e9bd5c771bd02bd66d3db152e29883767d9c..ea2c8ed9e6afaa82f892e6f33652e8bcaf55bf5d"
+    "shas": "a202a1786db14c5aa72a798fde8a012331fd57ae..295b42f6346c7c468c76810a8ce25f0660f81757"
 }
 ,{
     "testCaseDescription": "javascript-delete-operator-delete-rest-test",
@@ -343,5 +343,5 @@
         "-delete thing.prop"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ea2c8ed9e6afaa82f892e6f33652e8bcaf55bf5d..788020560a8fdb300dff202c696815f281416456"
+    "shas": "295b42f6346c7c468c76810a8ce25f0660f81757..a06758561604cc1a81d1b788effb727feba31d2d"
 }]
diff --git a/test/corpus/diff-summaries/javascript/do-while-statement.json b/test/corpus/diff-summaries/javascript/do-while-statement.json
index 6ab7049f6..0e4d3801c 100644
--- a/test/corpus/diff-summaries/javascript/do-while-statement.json
+++ b/test/corpus/diff-summaries/javascript/do-while-statement.json
@@ -34,7 +34,7 @@
         "+do { console.log(insert); } while (true);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "48d3ef87f99a7129141975782e612cef84f46829..47fdb7dae90deae8f5a1ddaade3a4da8aed3bddb"
+    "shas": "9632a8f95e9b8124c8c341c857ef8667269f18d5..0ad50c5e207e0be1c850d9d806b4a7c63e04b5ac"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-replacement-insert-test",
@@ -89,7 +89,7 @@
         " do { console.log(insert); } while (true);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "47fdb7dae90deae8f5a1ddaade3a4da8aed3bddb..8dfe4bfffb91e763a57bb7437a643317f95005cc"
+    "shas": "0ad50c5e207e0be1c850d9d806b4a7c63e04b5ac..867c80d114f6e22d8ce379cca71162cb7dc86baf"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-insert-test",
@@ -169,7 +169,7 @@
         " do { console.log(insert); } while (true);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8dfe4bfffb91e763a57bb7437a643317f95005cc..f74da794cf0726b10bba95453d13d695c8a3c790"
+    "shas": "867c80d114f6e22d8ce379cca71162cb7dc86baf..c445c120a1310df5c5a9bc2c32526dba5acdd98b"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-replacement-test",
@@ -249,7 +249,7 @@
         " do { console.log(insert); } while (true);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f74da794cf0726b10bba95453d13d695c8a3c790..61870a9079d930bcda72b7244ce914736f439ce5"
+    "shas": "c445c120a1310df5c5a9bc2c32526dba5acdd98b..980edee9075b26bf191cb4450c199a22d48676a9"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-replacement-test",
@@ -320,7 +320,7 @@
         "+do { console.log(replacement); } while (false);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "61870a9079d930bcda72b7244ce914736f439ce5..d9996cc8fc0b486253a2f78ceb1b772fd716e850"
+    "shas": "980edee9075b26bf191cb4450c199a22d48676a9..916844f1d3a6dbf5345ba544688ada96d6f84eef"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-test",
@@ -359,7 +359,7 @@
         " do { console.log(replacement); } while (false);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d9996cc8fc0b486253a2f78ceb1b772fd716e850..3f3112ede154d004a4fef1e6b2d710503dade46a"
+    "shas": "916844f1d3a6dbf5345ba544688ada96d6f84eef..7fb9fbe0c0da8f74a52b6e857c9f62cc84f4f36c"
 }
 ,{
     "testCaseDescription": "javascript-do-while-statement-delete-rest-test",
@@ -397,5 +397,5 @@
         "-do { console.log(replacement); } while (false);"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3f3112ede154d004a4fef1e6b2d710503dade46a..ee66417eb88b151832b600af9c2b381b2e52880e"
+    "shas": "7fb9fbe0c0da8f74a52b6e857c9f62cc84f4f36c..74e038f85a6296e615673af5f418b547515cc536"
 }]
diff --git a/test/corpus/diff-summaries/javascript/export.json b/test/corpus/diff-summaries/javascript/export.json
index 3db499ba2..bc68a0740 100644
--- a/test/corpus/diff-summaries/javascript/export.json
+++ b/test/corpus/diff-summaries/javascript/export.json
@@ -194,7 +194,7 @@
         "+export { import1 as name1, import2 as name2, nameN } from 'bar';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "be1bd2dff0107fc60e25707f2c27edec41f646ff..94fbe62beb0b9d5bd87916b16626ade5757be77c"
+    "shas": "93d61682f6d79a6052cbf60b15695e864b0916f2..d956a4b2dc0b7b5c0ec1a1d2bb96533fdf76249c"
 }
 ,{
     "testCaseDescription": "javascript-export-replacement-insert-test",
@@ -571,7 +571,7 @@
         " export let name1, name2, nameN;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "94fbe62beb0b9d5bd87916b16626ade5757be77c..33315fb792d3dd55c8dad8aec745f479637b74d8"
+    "shas": "d956a4b2dc0b7b5c0ec1a1d2bb96533fdf76249c..c892c06d875d18bcf05359cfff73fd9a186e4fdb"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-insert-test",
@@ -1122,7 +1122,7 @@
         " export let name1, name2, nameN;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "33315fb792d3dd55c8dad8aec745f479637b74d8..bcd26f8508f792d9e92d3e85da588b043958be7f"
+    "shas": "c892c06d875d18bcf05359cfff73fd9a186e4fdb..40562bc46efd313b1a29f9668beb9cf5101f4c21"
 }
 ,{
     "testCaseDescription": "javascript-export-replacement-test",
@@ -1485,33 +1485,30 @@
                 },
                 {
                     "span": {
-                        "insert": {
-                            "start": [
-                                11,
-                                1
-                            ],
-                            "end": [
-                                11,
-                                66
-                            ]
-                        }
+                        "replace": [
+                            {
+                                "start": [
+                                    3,
+                                    1
+                                ],
+                                "end": [
+                                    3,
+                                    32
+                                ]
+                            },
+                            {
+                                "start": [
+                                    11,
+                                    1
+                                ],
+                                "end": [
+                                    11,
+                                    66
+                                ]
+                            }
+                        ]
                     },
-                    "summary": "Added the { import6 as name6, import7 as name7, nameB } from 'fizz' export statement"
-                },
-                {
-                    "span": {
-                        "delete": {
-                            "start": [
-                                3,
-                                1
-                            ],
-                            "end": [
-                                3,
-                                32
-                            ]
-                        }
-                    },
-                    "summary": "Deleted the { name1, name2, nameN } export statement"
+                    "summary": "Replaced the { name1, name2, nameN } export statement with the { import6 as name6, import7 as name7, nameB } from 'fizz' export statement"
                 },
                 {
                     "span": {
@@ -1673,7 +1670,7 @@
         " export let name1, name2, nameN;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "bcd26f8508f792d9e92d3e85da588b043958be7f..2b9bf50a05887a7a162d095a2abfeca055308bc8"
+    "shas": "40562bc46efd313b1a29f9668beb9cf5101f4c21..1ca60a2771c2ba2bf75dcf4bb611460177e4dd09"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-replacement-test",
@@ -2230,7 +2227,7 @@
         "+export { import6 as name6, import7 as name7, nameB } from 'fizz';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2b9bf50a05887a7a162d095a2abfeca055308bc8..34e4cddde5d1b60cd8f711bb1c58b9ee16d36001"
+    "shas": "1ca60a2771c2ba2bf75dcf4bb611460177e4dd09..94e431db36d07de49618f94ebb60bd1f4d5236e7"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-test",
@@ -2431,7 +2428,7 @@
         " export let name3, name4, nameT;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "34e4cddde5d1b60cd8f711bb1c58b9ee16d36001..4a053ca50921f795644922f2ed23f98974d7d5bc"
+    "shas": "94e431db36d07de49618f94ebb60bd1f4d5236e7..c598fa1044d2bf1978fa258fc92b7e056f1aed7f"
 }
 ,{
     "testCaseDescription": "javascript-export-delete-rest-test",
@@ -2629,5 +2626,5 @@
         "-export { import6 as name6, import7 as name7, nameB } from 'fizz';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4a053ca50921f795644922f2ed23f98974d7d5bc..689c75b2c901c257422d3759b780fc15b9819a0d"
+    "shas": "c598fa1044d2bf1978fa258fc92b7e056f1aed7f..9ab4bb09dfbde3a5662c1756a7139a8726a32035"
 }]
diff --git a/test/corpus/diff-summaries/javascript/false.json b/test/corpus/diff-summaries/javascript/false.json
index f2c504d5b..f3733fa9e 100644
--- a/test/corpus/diff-summaries/javascript/false.json
+++ b/test/corpus/diff-summaries/javascript/false.json
@@ -34,7 +34,7 @@
         "+false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3404e2f9981f841657789983a30885db1872d717..e32d226417893d90b90c717bc9b4739ef2731415"
+    "shas": "551ca9fdcba5734d73b3d1f9ce9a19e373fbaeb6..c50e73fc768e063d4fd21bc65edc403b64e2c9da"
 }
 ,{
     "testCaseDescription": "javascript-false-replacement-insert-test",
@@ -89,7 +89,7 @@
         " false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e32d226417893d90b90c717bc9b4739ef2731415..a44e2cc71169f20db65adf8d366682a6fe00e290"
+    "shas": "c50e73fc768e063d4fd21bc65edc403b64e2c9da..3ac8905eb5c81d35c5bb031fecb94d27fa8f07df"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-insert-test",
@@ -145,7 +145,7 @@
         " false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a44e2cc71169f20db65adf8d366682a6fe00e290..2a86beea0ad48757fb4535a6b4e01f2a8d1eb126"
+    "shas": "3ac8905eb5c81d35c5bb031fecb94d27fa8f07df..12da1916baa21d2b488833752cfdd4804db40c70"
 }
 ,{
     "testCaseDescription": "javascript-false-replacement-test",
@@ -201,7 +201,7 @@
         " false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2a86beea0ad48757fb4535a6b4e01f2a8d1eb126..d17653b6c7ba93cfb9d0ff774a68e29b1aee2d9b"
+    "shas": "12da1916baa21d2b488833752cfdd4804db40c70..1ad5956e04ff6f1e24a75348aeab80c2e935fad0"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-replacement-test",
@@ -272,7 +272,7 @@
         "+return false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d17653b6c7ba93cfb9d0ff774a68e29b1aee2d9b..fa9113a78c78561620fd5ad48a5a4d3b22056832"
+    "shas": "1ad5956e04ff6f1e24a75348aeab80c2e935fad0..d301b2ddaa3a0b226b07ac653599111438a97dc0"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-test",
@@ -311,7 +311,7 @@
         " return false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "fa9113a78c78561620fd5ad48a5a4d3b22056832..0cb01c5633b7b5a84ed2d5f6c50fff5c609755c5"
+    "shas": "d301b2ddaa3a0b226b07ac653599111438a97dc0..a3ba4035afc4644813359865e82c9d54973a40b6"
 }
 ,{
     "testCaseDescription": "javascript-false-delete-rest-test",
@@ -349,5 +349,5 @@
         "-return false;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0cb01c5633b7b5a84ed2d5f6c50fff5c609755c5..5d563ac383acc3c789fbd552c697d625c0f424fc"
+    "shas": "a3ba4035afc4644813359865e82c9d54973a40b6..44ab56bc4e78762b4754c401e610d9e8da5069d9"
 }]
diff --git a/test/corpus/diff-summaries/javascript/for-in-statement.json b/test/corpus/diff-summaries/javascript/for-in-statement.json
index e46d2b952..2e80911c1 100644
--- a/test/corpus/diff-summaries/javascript/for-in-statement.json
+++ b/test/corpus/diff-summaries/javascript/for-in-statement.json
@@ -34,7 +34,7 @@
         "+for (thing in things) { thing(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "58aa7b1cb85df06bb4b647466c43f5c4862c695f..6a3e5d7ab858bcd204986ac6ddf41be3c15b3b3d"
+    "shas": "af83ea94ea31585dc756784eea2fcd63e383a994..f1b97affa2097f7fb1e431a1f096fe671b023b01"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-replacement-insert-test",
@@ -89,7 +89,7 @@
         " for (thing in things) { thing(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6a3e5d7ab858bcd204986ac6ddf41be3c15b3b3d..d6ad795d65a034c3533bba704a5d815200fc52aa"
+    "shas": "f1b97affa2097f7fb1e431a1f096fe671b023b01..d40dfaad3e433f92e47d77e2dec7b8ee1f9336d4"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-insert-test",
@@ -196,7 +196,7 @@
         " for (thing in things) { thing(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d6ad795d65a034c3533bba704a5d815200fc52aa..dff97b983476385bb15314a17278b6108c4e5bfa"
+    "shas": "d40dfaad3e433f92e47d77e2dec7b8ee1f9336d4..80e4d2015d8131cfea810de3f1a9b1bef9e41ca0"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-replacement-test",
@@ -303,7 +303,7 @@
         " for (thing in things) { thing(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "dff97b983476385bb15314a17278b6108c4e5bfa..c6a910a31691c82532e8413dbda5e29bbae68b32"
+    "shas": "80e4d2015d8131cfea810de3f1a9b1bef9e41ca0..e0ac17caa81a163bfb88c8868fce228bd6f673c9"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-replacement-test",
@@ -374,7 +374,7 @@
         "+for (item in items) { item(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c6a910a31691c82532e8413dbda5e29bbae68b32..1ec1a3068de40b2767847a640a8b0139f271dfae"
+    "shas": "e0ac17caa81a163bfb88c8868fce228bd6f673c9..c8a6b23e83591d69e2492c79ca2acbab8a60c06e"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-test",
@@ -413,7 +413,7 @@
         " for (item in items) { item(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1ec1a3068de40b2767847a640a8b0139f271dfae..59da009b44fc653570e96a3dfb3211b31872bca3"
+    "shas": "c8a6b23e83591d69e2492c79ca2acbab8a60c06e..d4b1f33817f392a83cd5eb29bf9ecfeb196e0597"
 }
 ,{
     "testCaseDescription": "javascript-for-in-statement-delete-rest-test",
@@ -451,5 +451,5 @@
         "-for (item in items) { item(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "59da009b44fc653570e96a3dfb3211b31872bca3..d03236f8517c53c78b398fe3778c8170b54e36ea"
+    "shas": "d4b1f33817f392a83cd5eb29bf9ecfeb196e0597..108691eaf6389b97fcdc69fa9af5ec37ddea808b"
 }]
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 050a23405..5adb780a0 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
@@ -34,7 +34,7 @@
         "+for (key in something && i = 0; i < n; i++) { doSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f2eb239be06cc6a99d83ff77dc9852645f8a006b..e7fa29416487b01b878efdd2c73d11914804b9be"
+    "shas": "ee2bc6eb6721a9dc9b1cf7216a7bc251e3aa9110..0faead91699f4d2b565f79ee38b667013384d8e7"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-replacement-insert-test",
@@ -89,7 +89,7 @@
         " for (key in something && i = 0; i < n; i++) { doSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e7fa29416487b01b878efdd2c73d11914804b9be..aa573efa719e1be8687189599e8294b233afbd2b"
+    "shas": "0faead91699f4d2b565f79ee38b667013384d8e7..d16322e3777e2b8ab9b7ce319c748a6297d970cb"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-insert-test",
@@ -169,7 +169,7 @@
         " for (key in something && i = 0; i < n; i++) { doSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "aa573efa719e1be8687189599e8294b233afbd2b..766cce0f123eddc34a16787fbeb019fb2a1ecd12"
+    "shas": "d16322e3777e2b8ab9b7ce319c748a6297d970cb..32469a6acead6144620cc0db9b78e722e457dba7"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-replacement-test",
@@ -249,7 +249,7 @@
         " for (key in something && i = 0; i < n; i++) { doSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "766cce0f123eddc34a16787fbeb019fb2a1ecd12..3c743b7d417934597326114cf7a45ae0136d44dc"
+    "shas": "32469a6acead6144620cc0db9b78e722e457dba7..6447a7c1fd2a44dd374b607ce7beb56df3732dbb"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-replacement-test",
@@ -320,7 +320,7 @@
         "+for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3c743b7d417934597326114cf7a45ae0136d44dc..16e9e853bb10e1be74c7f39361af4bc8858ef8e0"
+    "shas": "6447a7c1fd2a44dd374b607ce7beb56df3732dbb..b1938e9bb425528fbf652df004e3eda466900ec7"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-test",
@@ -359,7 +359,7 @@
         " for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "16e9e853bb10e1be74c7f39361af4bc8858ef8e0..beb03500501b1e8607dad975a7f423f8baf33d94"
+    "shas": "b1938e9bb425528fbf652df004e3eda466900ec7..6ac074e27614c7d85c196aacc19be448097c8445"
 }
 ,{
     "testCaseDescription": "javascript-for-loop-with-in-statement-delete-rest-test",
@@ -397,5 +397,5 @@
         "-for (otherKey in something && i = 0; i < n; i++) { doOtherSomething(); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "beb03500501b1e8607dad975a7f423f8baf33d94..e9db20e9b701c8a70a82df7f42dc862632f34005"
+    "shas": "6ac074e27614c7d85c196aacc19be448097c8445..89b62eec408922c8dcad9c54e045d34c783da30f"
 }]
diff --git a/test/corpus/diff-summaries/javascript/for-of-statement.json b/test/corpus/diff-summaries/javascript/for-of-statement.json
index 5d7d4ae27..5dbbe6483 100644
--- a/test/corpus/diff-summaries/javascript/for-of-statement.json
+++ b/test/corpus/diff-summaries/javascript/for-of-statement.json
@@ -34,7 +34,7 @@
         "+for (let item of items) { process(item); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e9db20e9b701c8a70a82df7f42dc862632f34005..e6d287ef4ceedccefb165e24cc0fd2fd186d5a45"
+    "shas": "89b62eec408922c8dcad9c54e045d34c783da30f..948ba39d4d029f7621a695436a0d2ddf02c6d93b"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-replacement-insert-test",
@@ -89,7 +89,7 @@
         " for (let item of items) { process(item); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e6d287ef4ceedccefb165e24cc0fd2fd186d5a45..0f41c6e8f4378275d415c4f89d1ae0edd5861240"
+    "shas": "948ba39d4d029f7621a695436a0d2ddf02c6d93b..7e3b3cdcb0e37778e26c41ded72d66e7a81bd259"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-insert-test",
@@ -196,7 +196,7 @@
         " for (let item of items) { process(item); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0f41c6e8f4378275d415c4f89d1ae0edd5861240..a6b618329e1c061028f5ae9fba2116fd281b6f44"
+    "shas": "7e3b3cdcb0e37778e26c41ded72d66e7a81bd259..214da18c3075208b526872072329e501f8d9d20b"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-replacement-test",
@@ -303,7 +303,7 @@
         " for (let item of items) { process(item); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a6b618329e1c061028f5ae9fba2116fd281b6f44..a2b19ddc74c11b06577cc04ee17fb5014c509809"
+    "shas": "214da18c3075208b526872072329e501f8d9d20b..c3f015268cf87cb0fea3dad078b323823bfd27b4"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-replacement-test",
@@ -374,7 +374,7 @@
         "+for (let thing of things) { process(thing); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a2b19ddc74c11b06577cc04ee17fb5014c509809..716471c15df7e4f9d467c16b72773575ab0daf20"
+    "shas": "c3f015268cf87cb0fea3dad078b323823bfd27b4..fccf8a23cc8b1106d1a71d040450fc47f0af84b7"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-test",
@@ -413,7 +413,7 @@
         " for (let thing of things) { process(thing); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "716471c15df7e4f9d467c16b72773575ab0daf20..742d48d2166f7f4e5e0d6d0ebd86afa36266f86a"
+    "shas": "fccf8a23cc8b1106d1a71d040450fc47f0af84b7..8c6c7677d447864b8159d0aeadaaa5c31fd7db04"
 }
 ,{
     "testCaseDescription": "javascript-for-of-statement-delete-rest-test",
@@ -451,5 +451,5 @@
         "-for (let thing of things) { process(thing); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "742d48d2166f7f4e5e0d6d0ebd86afa36266f86a..a43b37a27c89c6d1f96f5a83f5498c56b9e45338"
+    "shas": "8c6c7677d447864b8159d0aeadaaa5c31fd7db04..d2768fbb95f8527eec1b8d88197c99a65a72c36a"
 }]
diff --git a/test/corpus/diff-summaries/javascript/for-statement.json b/test/corpus/diff-summaries/javascript/for-statement.json
index da07b404c..fc22f6317 100644
--- a/test/corpus/diff-summaries/javascript/for-statement.json
+++ b/test/corpus/diff-summaries/javascript/for-statement.json
@@ -34,7 +34,7 @@
         "+for (i = 0, init(); i < 10; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c320f90e127c691529e4c298d3ff3969a0483c8e..119df29f1b8c4152c752d221354c7143086f0ba9"
+    "shas": "45467bfb48246946f982ba93b62baaa10e72db4f..a12b722012680e194d1613ccd223f31c1df2a509"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-replacement-insert-test",
@@ -89,7 +89,7 @@
         " for (i = 0, init(); i < 10; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "119df29f1b8c4152c752d221354c7143086f0ba9..d125a35865450614b4947f6e64be6d447f3d00b9"
+    "shas": "a12b722012680e194d1613ccd223f31c1df2a509..90b650a3b6f6323f381671c04d2389be863243f8"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-insert-test",
@@ -142,7 +142,7 @@
         " for (i = 0, init(); i < 10; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d125a35865450614b4947f6e64be6d447f3d00b9..d6241bcabe282470e4224aad942ff060ca01eecf"
+    "shas": "90b650a3b6f6323f381671c04d2389be863243f8..927228295f344b634ef104f57cf37f956d9bc3ad"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-replacement-test",
@@ -195,7 +195,7 @@
         " for (i = 0, init(); i < 10; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d6241bcabe282470e4224aad942ff060ca01eecf..a42953f4ddb4d9c4db7e33c68117f329ac6e08b9"
+    "shas": "927228295f344b634ef104f57cf37f956d9bc3ad..288d606b663561c3bf48d1979b42adb629601d28"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+for (i = 0, init(); i < 100; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a42953f4ddb4d9c4db7e33c68117f329ac6e08b9..054aae5c741bcc075e61263fab2004c700f4f681"
+    "shas": "288d606b663561c3bf48d1979b42adb629601d28..a1025ce0b427e3c532efe0b47bdf5e7ea149f917"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-test",
@@ -305,7 +305,7 @@
         " for (i = 0, init(); i < 100; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "054aae5c741bcc075e61263fab2004c700f4f681..168c29c5108a6a63f29746df65a3886bb8489f94"
+    "shas": "a1025ce0b427e3c532efe0b47bdf5e7ea149f917..d9e570418443c2385b0f2d670618ef2089c1fad5"
 }
 ,{
     "testCaseDescription": "javascript-for-statement-delete-rest-test",
@@ -343,5 +343,5 @@
         "-for (i = 0, init(); i < 100; i++) { log(i); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "168c29c5108a6a63f29746df65a3886bb8489f94..ae3598b402258260e941e7a876918f8037bf887d"
+    "shas": "d9e570418443c2385b0f2d670618ef2089c1fad5..4ef69625070791efda498ad25dd15ea404e80a0a"
 }]
diff --git a/test/corpus/diff-summaries/javascript/function-call-args.json b/test/corpus/diff-summaries/javascript/function-call-args.json
index d24c67560..5e6a46f15 100644
--- a/test/corpus/diff-summaries/javascript/function-call-args.json
+++ b/test/corpus/diff-summaries/javascript/function-call-args.json
@@ -34,7 +34,7 @@
         "+someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a1cfaadb31d0f0d28d7449d160ba2ed06ec9c6af..f765da24248e68bf31db9272cd07fd27732ce9da"
+    "shas": "c81796cd087e4f62be538eda89091e76ae3fa5a7..2dcd4e9aca00fd5e17919192577b33fb98d71c13"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-replacement-insert-test",
@@ -89,7 +89,7 @@
         " someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f765da24248e68bf31db9272cd07fd27732ce9da..5caf097567f54bba021b07365b69f238385b23d6"
+    "shas": "2dcd4e9aca00fd5e17919192577b33fb98d71c13..82fbfc8977c8ebdf221e26ad4bc3e697f1d76238"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-insert-test",
@@ -277,7 +277,7 @@
         " someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5caf097567f54bba021b07365b69f238385b23d6..a418e2295aafa9eedc993771ad325a32d94e3cb6"
+    "shas": "82fbfc8977c8ebdf221e26ad4bc3e697f1d76238..9cb1d2cd3ad6564bba80063e6d2662ca3d98a9d3"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-replacement-test",
@@ -465,7 +465,7 @@
         " someFunction(1, \"string\", function(a,b) { console.log(a); return b; }, true)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a418e2295aafa9eedc993771ad325a32d94e3cb6..f0f325f6ce0df4ba500ebb3845ad93dc904ba24b"
+    "shas": "9cb1d2cd3ad6564bba80063e6d2662ca3d98a9d3..4cefcbd95b2b9617cb55dd43be6f0aa1fb55fdf3"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-replacement-test",
@@ -536,7 +536,7 @@
         "+someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f0f325f6ce0df4ba500ebb3845ad93dc904ba24b..b77a2a6a266180d3d20a483bb63291ead5827012"
+    "shas": "4cefcbd95b2b9617cb55dd43be6f0aa1fb55fdf3..c0cde2d7604151d379e0ea9e597a127426348280"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-test",
@@ -575,7 +575,7 @@
         " someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b77a2a6a266180d3d20a483bb63291ead5827012..b879b321d2517cc0edaeeb2bbf71f455415bd3a4"
+    "shas": "c0cde2d7604151d379e0ea9e597a127426348280..66bf984d8a5e5e011b0318a5682d18022dc541b5"
 }
 ,{
     "testCaseDescription": "javascript-function-call-args-delete-rest-test",
@@ -613,5 +613,5 @@
         "-someFunction(1, \"otherString\", function(b,c) { console.log(b); return c; }, false)"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b879b321d2517cc0edaeeb2bbf71f455415bd3a4..347b15603c28f7232a36d6d312d1c335a4dd39db"
+    "shas": "66bf984d8a5e5e011b0318a5682d18022dc541b5..f51bc6f2b12d9f7a4271606e1d4fcc442eb2688d"
 }]
diff --git a/test/corpus/diff-summaries/javascript/function-call.json b/test/corpus/diff-summaries/javascript/function-call.json
index def363d7e..7a9019eb9 100644
--- a/test/corpus/diff-summaries/javascript/function-call.json
+++ b/test/corpus/diff-summaries/javascript/function-call.json
@@ -34,7 +34,7 @@
         "+someFunction(arg1, \"arg2\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c95bd0e01ff1d7d686262b782db20ad959d3676f..8d35c071d83baf7595dd69c6e63000d814343485"
+    "shas": "28f109decac7a1c87036b0de6ddae80ed15ba2a1..e751201f83cc22bf828a33cff5c2d4d24caa87f0"
 }
 ,{
     "testCaseDescription": "javascript-function-call-replacement-insert-test",
@@ -89,7 +89,7 @@
         " someFunction(arg1, \"arg2\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8d35c071d83baf7595dd69c6e63000d814343485..ced1926b498dacd2bb8365d9c9f7c07f75229170"
+    "shas": "e751201f83cc22bf828a33cff5c2d4d24caa87f0..7c4b8f710f315bc29577ec8db7c9e93432a0e6db"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-insert-test",
@@ -142,7 +142,7 @@
         " someFunction(arg1, \"arg2\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ced1926b498dacd2bb8365d9c9f7c07f75229170..1c76636d16ecfbdf2c061cbee3c6e9c8ead03189"
+    "shas": "7c4b8f710f315bc29577ec8db7c9e93432a0e6db..353668a765069b4096670678949a555dfd0be25f"
 }
 ,{
     "testCaseDescription": "javascript-function-call-replacement-test",
@@ -195,7 +195,7 @@
         " someFunction(arg1, \"arg2\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1c76636d16ecfbdf2c061cbee3c6e9c8ead03189..d988eca7c678f25f5400db278a7092b4af201c36"
+    "shas": "353668a765069b4096670678949a555dfd0be25f..5f5858c3752dce5c57fb2ec627435478f475b706"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+someFunction(arg1, \"arg3\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d988eca7c678f25f5400db278a7092b4af201c36..46e628cebf19ab82cf52a1c276553dd4deb19448"
+    "shas": "5f5858c3752dce5c57fb2ec627435478f475b706..05bccda6be14784e187aa28870bcfe9bd352500c"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-test",
@@ -305,7 +305,7 @@
         " someFunction(arg1, \"arg3\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "46e628cebf19ab82cf52a1c276553dd4deb19448..38cde3809ada68234c67c79128fa24657a566d83"
+    "shas": "05bccda6be14784e187aa28870bcfe9bd352500c..600a25a06e03d6cd538f000dafe2fb6c01f1d4b0"
 }
 ,{
     "testCaseDescription": "javascript-function-call-delete-rest-test",
@@ -343,5 +343,5 @@
         "-someFunction(arg1, \"arg3\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "38cde3809ada68234c67c79128fa24657a566d83..2d43584fc8ddc7ca7298a1e0e0a9be013b19f0be"
+    "shas": "600a25a06e03d6cd538f000dafe2fb6c01f1d4b0..7ac818c08ed7e0badc60f225f6a1db12b6876c10"
 }]
diff --git a/test/corpus/diff-summaries/javascript/function.json b/test/corpus/diff-summaries/javascript/function.json
index 908158e37..3c8e1e314 100644
--- a/test/corpus/diff-summaries/javascript/function.json
+++ b/test/corpus/diff-summaries/javascript/function.json
@@ -34,7 +34,7 @@
         "+function(arg1, arg2) { arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "790803fdb50f5b52531a5fd1dc0573fd2b036126..7922b25d0276bdf1431e206d3709b1fbf28c9133"
+    "shas": "2be4c53970c1476bbb354be878424d6aec954c3b..e566325dc47e503736d658fc6237e08a009c1185"
 }
 ,{
     "testCaseDescription": "javascript-function-replacement-insert-test",
@@ -89,7 +89,7 @@
         " function(arg1, arg2) { arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7922b25d0276bdf1431e206d3709b1fbf28c9133..0078e81905fd24f5b8331a8afdb513e1cef9d37b"
+    "shas": "e566325dc47e503736d658fc6237e08a009c1185..2afb0e7fd4236e4b29fd490cf1b62f8c9cd0aa4c"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-insert-test",
@@ -142,7 +142,7 @@
         " function(arg1, arg2) { arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0078e81905fd24f5b8331a8afdb513e1cef9d37b..46927e5733291be730cf9c3c08ba0310d5741b1a"
+    "shas": "2afb0e7fd4236e4b29fd490cf1b62f8c9cd0aa4c..45dd66dbc8f8be169cdecce0b9c97d87f9ca11dc"
 }
 ,{
     "testCaseDescription": "javascript-function-replacement-test",
@@ -195,7 +195,7 @@
         " function(arg1, arg2) { arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "46927e5733291be730cf9c3c08ba0310d5741b1a..20a5479f9e8a063124d86ae85541ce7fdc62beef"
+    "shas": "45dd66dbc8f8be169cdecce0b9c97d87f9ca11dc..41a354cba04c0211386645c4289065cc24bdeef3"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+function(arg1, arg2) { arg1; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "20a5479f9e8a063124d86ae85541ce7fdc62beef..2834c6bfa834cd256af7b261c00c9ea9f4c89b29"
+    "shas": "41a354cba04c0211386645c4289065cc24bdeef3..f291cc92d0771db6741373222d4a87ad70a2ec50"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-test",
@@ -305,7 +305,7 @@
         " function(arg1, arg2) { arg1; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2834c6bfa834cd256af7b261c00c9ea9f4c89b29..c2fbf6621ebe94f439fc6c087171487345109a21"
+    "shas": "f291cc92d0771db6741373222d4a87ad70a2ec50..894e344b0f932970bf8c7ac7171f50e9a3ecfb31"
 }
 ,{
     "testCaseDescription": "javascript-function-delete-rest-test",
@@ -343,5 +343,5 @@
         "-function(arg1, arg2) { arg1; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c2fbf6621ebe94f439fc6c087171487345109a21..42d2564cba025ea67f19ffdd328b554aa2aede8b"
+    "shas": "894e344b0f932970bf8c7ac7171f50e9a3ecfb31..3db5e012ed131477f930a3f737f9f525618c5e14"
 }]
diff --git a/test/corpus/diff-summaries/javascript/generator-function.json b/test/corpus/diff-summaries/javascript/generator-function.json
index fa9e97d7f..f22503229 100644
--- a/test/corpus/diff-summaries/javascript/generator-function.json
+++ b/test/corpus/diff-summaries/javascript/generator-function.json
@@ -34,7 +34,7 @@
         "+function *generateStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "39852cdd4b70a1926580629f96ee4221841afb76..f14e45177bf87d972dd094d434afebf6ab7bd2e7"
+    "shas": "d8102af2a206032f1800de2be9ffff6d65b2efeb..de67b99e61edaca7ae981ed9c142f6ab95d9f432"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-replacement-insert-test",
@@ -89,7 +89,7 @@
         " function *generateStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f14e45177bf87d972dd094d434afebf6ab7bd2e7..f7e60bdec026c0669a9c5740f86204b27f7351f8"
+    "shas": "de67b99e61edaca7ae981ed9c142f6ab95d9f432..7ee3abaa92ddfabb7e8c00dcd6f29d54fe8dbfd5"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-insert-test",
@@ -142,7 +142,7 @@
         " function *generateStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f7e60bdec026c0669a9c5740f86204b27f7351f8..0d59204851c1defc1f7b39faa5dfa1ce3cf8e77d"
+    "shas": "7ee3abaa92ddfabb7e8c00dcd6f29d54fe8dbfd5..372df0851ac98c464084e9cea2c92c49523231f1"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-replacement-test",
@@ -195,7 +195,7 @@
         " function *generateStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0d59204851c1defc1f7b39faa5dfa1ce3cf8e77d..4f673ed556db59aa5ff08ce0b91eb810dfa92480"
+    "shas": "372df0851ac98c464084e9cea2c92c49523231f1..c459aa7f1d4096990986fb3f21a1a189bf9b8089"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+function *generateNewStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4f673ed556db59aa5ff08ce0b91eb810dfa92480..f125f53e66438da88bf2ec0c852bc06209d09ab2"
+    "shas": "c459aa7f1d4096990986fb3f21a1a189bf9b8089..76ab51c9ae7737b7e80c4fde367a23b3e5b2593d"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-test",
@@ -305,7 +305,7 @@
         " function *generateNewStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f125f53e66438da88bf2ec0c852bc06209d09ab2..463b6c8615c519be4614c47e4b212f7b8ee83c74"
+    "shas": "76ab51c9ae7737b7e80c4fde367a23b3e5b2593d..b0b956ba5fff84d1434db18b092a00f00b386be4"
 }
 ,{
     "testCaseDescription": "javascript-generator-function-delete-rest-test",
@@ -343,5 +343,5 @@
         "-function *generateNewStuff(arg1, arg2) { yield; yield arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "463b6c8615c519be4614c47e4b212f7b8ee83c74..15e84394f61437f6604f6255ce0c5d818ac3115f"
+    "shas": "b0b956ba5fff84d1434db18b092a00f00b386be4..e2bc5f41752affe43a52e069b9eb8b2a96177c3d"
 }]
diff --git a/test/corpus/diff-summaries/javascript/identifier.json b/test/corpus/diff-summaries/javascript/identifier.json
index 20bd57f97..b8e9cac75 100644
--- a/test/corpus/diff-summaries/javascript/identifier.json
+++ b/test/corpus/diff-summaries/javascript/identifier.json
@@ -34,7 +34,7 @@
         "+theVar;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2e3b3e74fb24767ec84840379177e8834c44714f..c58ea49c1e9377ca12829fe3f5a136f01b7e2ad3"
+    "shas": "6fafed165d4a88fcc9e2b3dba7371aeadee185e4..114a0cd78de25272f4e9ba47085e4a6a1fab39ee"
 }
 ,{
     "testCaseDescription": "javascript-identifier-replacement-insert-test",
@@ -89,7 +89,7 @@
         " theVar;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c58ea49c1e9377ca12829fe3f5a136f01b7e2ad3..3efd488399a1b5c0e052e63c3d12a7740060b68e"
+    "shas": "114a0cd78de25272f4e9ba47085e4a6a1fab39ee..ff0ccb9d0e356bb197f5c306b88123ced4bac674"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-insert-test",
@@ -142,7 +142,7 @@
         " theVar;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3efd488399a1b5c0e052e63c3d12a7740060b68e..aadcf4a2b401f08a859d46b6e0ac3c703050abf3"
+    "shas": "ff0ccb9d0e356bb197f5c306b88123ced4bac674..87d8b10ecae782e4ec7b12b933c2ce2657d28b0b"
 }
 ,{
     "testCaseDescription": "javascript-identifier-replacement-test",
@@ -195,7 +195,7 @@
         " theVar;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "aadcf4a2b401f08a859d46b6e0ac3c703050abf3..1243dcd655eca55e1324bee33916146634b33ef4"
+    "shas": "87d8b10ecae782e4ec7b12b933c2ce2657d28b0b..8975c710ddebc06ed4478aa881142db452f3d5e1"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+theVar2"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1243dcd655eca55e1324bee33916146634b33ef4..010e826215ed50b559303d07617dfab6834d32fa"
+    "shas": "8975c710ddebc06ed4478aa881142db452f3d5e1..71a98ae6a067cb23e612551f9e48bdd3fc2eef43"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-test",
@@ -305,7 +305,7 @@
         " theVar2"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "010e826215ed50b559303d07617dfab6834d32fa..1925d455a32628bf996383fd9af1680b7cb7be68"
+    "shas": "71a98ae6a067cb23e612551f9e48bdd3fc2eef43..53b06cf390f8031356883e7fa7fa89cfe0bd571d"
 }
 ,{
     "testCaseDescription": "javascript-identifier-delete-rest-test",
@@ -343,5 +343,5 @@
         "-theVar2"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1925d455a32628bf996383fd9af1680b7cb7be68..11c817d08ac0cb3edac35eedef4ad8f04b290d77"
+    "shas": "53b06cf390f8031356883e7fa7fa89cfe0bd571d..be8a925f9e9f750a7a1e6b9f98b88d2754a5fbd1"
 }]
diff --git a/test/corpus/diff-summaries/javascript/if-else.json b/test/corpus/diff-summaries/javascript/if-else.json
index 9f9f00396..c7adb8b7b 100644
--- a/test/corpus/diff-summaries/javascript/if-else.json
+++ b/test/corpus/diff-summaries/javascript/if-else.json
@@ -34,7 +34,7 @@
         "+if (x) y; else if (a) b; else if (c) d; else if (e) f; else g"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0aabb2672ac5aa2ce7fbeb1cad74c6c09e985a74..251f01e7d8112d3409bd0bacb65529073c9f7ad2"
+    "shas": "b4cd78441921b033ec1c1b1714a071b9720cb895..aadf4d112491cdc472bee213f27a2dcf5c8681a6"
 }
 ,{
     "testCaseDescription": "javascript-if-else-replacement-insert-test",
@@ -89,7 +89,7 @@
         " if (x) y; else if (a) b; else if (c) d; else if (e) f; else g"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "251f01e7d8112d3409bd0bacb65529073c9f7ad2..f765fb5d1508d05122c61b191abc2ee22972cf41"
+    "shas": "aadf4d112491cdc472bee213f27a2dcf5c8681a6..f1e7e4f2c0fe8555888a47d41b3d2f5994c35ec0"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-insert-test",
@@ -364,7 +364,7 @@
         " if (x) y; else if (a) b; else if (c) d; else if (e) f; else g"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f765fb5d1508d05122c61b191abc2ee22972cf41..cf304bbed29534ab382b4e4f567f00a0a26753c0"
+    "shas": "f1e7e4f2c0fe8555888a47d41b3d2f5994c35ec0..fb6748df94bbff9f84c222be3a5223e4f286e6d6"
 }
 ,{
     "testCaseDescription": "javascript-if-else-replacement-test",
@@ -639,7 +639,7 @@
         " if (x) y; else if (a) b; else if (c) d; else if (e) f; else g"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cf304bbed29534ab382b4e4f567f00a0a26753c0..a477577ebcbc6152cb95204dbe944a8eeef763ee"
+    "shas": "fb6748df94bbff9f84c222be3a5223e4f286e6d6..b759f7b93d1635ed0f5fc019b59a77eab7e1ec4c"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-replacement-test",
@@ -710,7 +710,7 @@
         "+if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a477577ebcbc6152cb95204dbe944a8eeef763ee..5c5a9a2d4958d2216e875c57809d92ead3492f43"
+    "shas": "b759f7b93d1635ed0f5fc019b59a77eab7e1ec4c..937c826a445a6b127e7b7ad843d61679e3b29a3e"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-test",
@@ -749,7 +749,7 @@
         " if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5c5a9a2d4958d2216e875c57809d92ead3492f43..d9c9db24696581dd80a3c57675bae8d1f8d1093c"
+    "shas": "937c826a445a6b127e7b7ad843d61679e3b29a3e..be324949da4b47241ea8e830d97f64471037fe2a"
 }
 ,{
     "testCaseDescription": "javascript-if-else-delete-rest-test",
@@ -787,5 +787,5 @@
         "-if (g) h; else if (i) { j; } else if (k) l; else if (m) { n; } else o"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d9c9db24696581dd80a3c57675bae8d1f8d1093c..64dfefbc50b4a2c3c30e706f470afe7dac6fd8b2"
+    "shas": "be324949da4b47241ea8e830d97f64471037fe2a..414acb7061249f3ead467a7957efdb21229fcb7b"
 }]
diff --git a/test/corpus/diff-summaries/javascript/if.json b/test/corpus/diff-summaries/javascript/if.json
index 1fdfdd07c..47cc8e2a8 100644
--- a/test/corpus/diff-summaries/javascript/if.json
+++ b/test/corpus/diff-summaries/javascript/if.json
@@ -34,7 +34,7 @@
         "+if (x) { log(y); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "218c2bd7314aff78af0e6556d8eed307360c25c2..2732186abc154de41d49f73d26938a15461ba18c"
+    "shas": "83655892f9e9d2eee70e56c2adffd7594548e463..1d116a5383fcecace997187daf8eaf9b9d042c6d"
 }
 ,{
     "testCaseDescription": "javascript-if-replacement-insert-test",
@@ -89,7 +89,7 @@
         " if (x) { log(y); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2732186abc154de41d49f73d26938a15461ba18c..db64fdcb79dcb75922256363dae1d935e3139186"
+    "shas": "1d116a5383fcecace997187daf8eaf9b9d042c6d..b1b97f8f938385cb7845c6832bdf87d1a562213e"
 }
 ,{
     "testCaseDescription": "javascript-if-delete-insert-test",
@@ -142,7 +142,7 @@
         " if (x) { log(y); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "db64fdcb79dcb75922256363dae1d935e3139186..cee0dee6c39e9b55025445cb0f23a7d854231563"
+    "shas": "b1b97f8f938385cb7845c6832bdf87d1a562213e..af1bef55c0ca6adc7f20c358508ed24471776468"
 }
 ,{
     "testCaseDescription": "javascript-if-replacement-test",
@@ -195,7 +195,7 @@
         " if (x) { log(y); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cee0dee6c39e9b55025445cb0f23a7d854231563..30ed770f25208836cfdc58511cb3aa3e59051523"
+    "shas": "af1bef55c0ca6adc7f20c358508ed24471776468..81da464aa237b3dd8fdba181d9a4c4899ea81b28"
 }
 ,{
     "testCaseDescription": "javascript-if-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+if (a.b) { log(c); d; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "30ed770f25208836cfdc58511cb3aa3e59051523..7f23c6e8dd0d922b8e833635d9770c459ecc2a29"
+    "shas": "81da464aa237b3dd8fdba181d9a4c4899ea81b28..3af63ec3e2e73a2e3bd58ef82ba8063e9aff2193"
 }
 ,{
     "testCaseDescription": "javascript-if-delete-test",
@@ -305,7 +305,7 @@
         " if (a.b) { log(c); d; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7f23c6e8dd0d922b8e833635d9770c459ecc2a29..f441c886a7a8caf13eb03bf657cb2e5978d5f5fb"
+    "shas": "3af63ec3e2e73a2e3bd58ef82ba8063e9aff2193..0eaec27407e96cd6320c96fb3008f3bc2c47b25c"
 }
 ,{
     "testCaseDescription": "javascript-if-delete-rest-test",
@@ -343,5 +343,5 @@
         "-if (a.b) { log(c); d; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f441c886a7a8caf13eb03bf657cb2e5978d5f5fb..0aabb2672ac5aa2ce7fbeb1cad74c6c09e985a74"
+    "shas": "0eaec27407e96cd6320c96fb3008f3bc2c47b25c..b4cd78441921b033ec1c1b1714a071b9720cb895"
 }]
diff --git a/test/corpus/diff-summaries/javascript/import.json b/test/corpus/diff-summaries/javascript/import.json
index 035a21706..3aed9a5eb 100644
--- a/test/corpus/diff-summaries/javascript/import.json
+++ b/test/corpus/diff-summaries/javascript/import.json
@@ -146,7 +146,7 @@
         "+import \"arctic-tern\";"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0c5669ab3e40b0ec94a4b0b5eb1047853c0d51b0..c353ee5864b49a77a5d1952aa1539056122a5b77"
+    "shas": "5c937ca5ea01346dc9dd7236aa749f2f7d2df48d..5a42bcd34cbc2641b12f49bf0e39c7d2a75d5f27"
 }
 ,{
     "testCaseDescription": "javascript-import-replacement-insert-test",
@@ -427,7 +427,7 @@
         " import { member } from \"ant\";"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c353ee5864b49a77a5d1952aa1539056122a5b77..b76f818a0f17ba7cd7e18dacb818766c2f964c21"
+    "shas": "5a42bcd34cbc2641b12f49bf0e39c7d2a75d5f27..f872d068f8342ffa21671e26cf927b28219c404d"
 }
 ,{
     "testCaseDescription": "javascript-import-delete-insert-test",
@@ -726,7 +726,7 @@
         " import { member } from \"ant\";"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b76f818a0f17ba7cd7e18dacb818766c2f964c21..104f40889acb3987c562129b366e4a966b210853"
+    "shas": "f872d068f8342ffa21671e26cf927b28219c404d..2ae5447b083aace38919870ce7e2beebdc92afe2"
 }
 ,{
     "testCaseDescription": "javascript-import-replacement-test",
@@ -1025,7 +1025,7 @@
         " import { member } from \"ant\";"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "104f40889acb3987c562129b366e4a966b210853..f93cac22cc89b74398857072a9a7fc8dfc14fba2"
+    "shas": "2ae5447b083aace38919870ce7e2beebdc92afe2..3648b505d52daa9febca1054bd109c6f08619707"
 }
 ,{
     "testCaseDescription": "javascript-import-delete-replacement-test",
@@ -1438,7 +1438,7 @@
         "+import \"basilisk\";"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f93cac22cc89b74398857072a9a7fc8dfc14fba2..51369eded60c5198cd53026e12b5228fd321f44f"
+    "shas": "3648b505d52daa9febca1054bd109c6f08619707..0e1789b4572785fdef32950edb717497968c5128"
 }
 ,{
     "testCaseDescription": "javascript-import-delete-test",
@@ -1591,7 +1591,7 @@
         " import { element } from \"badger\";"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "51369eded60c5198cd53026e12b5228fd321f44f..b63c105d0396476af4f92991effdd80b3bf9724b"
+    "shas": "0e1789b4572785fdef32950edb717497968c5128..adc78c37860205837302ba8e24956ad035f24ac7"
 }
 ,{
     "testCaseDescription": "javascript-import-delete-rest-test",
@@ -1741,5 +1741,5 @@
         "-import \"basilisk\";"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b63c105d0396476af4f92991effdd80b3bf9724b..be1bd2dff0107fc60e25707f2c27edec41f646ff"
+    "shas": "adc78c37860205837302ba8e24956ad035f24ac7..93d61682f6d79a6052cbf60b15695e864b0916f2"
 }]
diff --git a/test/corpus/diff-summaries/javascript/math-assignment-operator.json b/test/corpus/diff-summaries/javascript/math-assignment-operator.json
index e17d1f408..0d6a0491b 100644
--- a/test/corpus/diff-summaries/javascript/math-assignment-operator.json
+++ b/test/corpus/diff-summaries/javascript/math-assignment-operator.json
@@ -34,7 +34,7 @@
         "+x += 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e063f0fd0c7f4b192b39469a0e1641349a596147..59d928b4843289616856e9e8bf8d9946cdad4c7f"
+    "shas": "e4d0ee4283c629c4f4db185bd8d0179f42fabd77..e9aa22936a48b99e4039ca79c889c5eb6ae88f3d"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-replacement-insert-test",
@@ -89,7 +89,7 @@
         " x += 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "59d928b4843289616856e9e8bf8d9946cdad4c7f..b721ff6fdd741eee50a4a16c42dd5b3bdde368fe"
+    "shas": "e9aa22936a48b99e4039ca79c889c5eb6ae88f3d..60d048bfffe2e9ce6103231bbea0f33d355c6f33"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-delete-insert-test",
@@ -142,7 +142,7 @@
         " x += 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b721ff6fdd741eee50a4a16c42dd5b3bdde368fe..e553ba9f63a48658ad19c2fe4cda15ed3ce0fcaa"
+    "shas": "60d048bfffe2e9ce6103231bbea0f33d355c6f33..7f2af95ac423a1d9c58e9fc0af9084d9badacc81"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-replacement-test",
@@ -195,7 +195,7 @@
         " x += 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e553ba9f63a48658ad19c2fe4cda15ed3ce0fcaa..acd95fd371df4275c2f26055683daed7b4673559"
+    "shas": "7f2af95ac423a1d9c58e9fc0af9084d9badacc81..83e70acd54ea100ea59edbb91850741ba8f4bf46"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+x += 2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "acd95fd371df4275c2f26055683daed7b4673559..7ebc730f67a3cf517e1dd456ee48c2d32a2f2174"
+    "shas": "83e70acd54ea100ea59edbb91850741ba8f4bf46..efd32378a779ec98d822d37348f27e40067fbfc3"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-delete-test",
@@ -305,7 +305,7 @@
         " x += 2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7ebc730f67a3cf517e1dd456ee48c2d32a2f2174..cd61146f65a5144b9b5d176204cc8793757b1963"
+    "shas": "efd32378a779ec98d822d37348f27e40067fbfc3..1e55c63078f94b4aa301f427638d8fc82cb43d34"
 }
 ,{
     "testCaseDescription": "javascript-math-assignment-operator-delete-rest-test",
@@ -343,5 +343,5 @@
         "-x += 2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cd61146f65a5144b9b5d176204cc8793757b1963..f2eb239be06cc6a99d83ff77dc9852645f8a006b"
+    "shas": "1e55c63078f94b4aa301f427638d8fc82cb43d34..ee2bc6eb6721a9dc9b1cf7216a7bc251e3aa9110"
 }]
diff --git a/test/corpus/diff-summaries/javascript/math-operator.json b/test/corpus/diff-summaries/javascript/math-operator.json
index d352285d3..d07055c00 100644
--- a/test/corpus/diff-summaries/javascript/math-operator.json
+++ b/test/corpus/diff-summaries/javascript/math-operator.json
@@ -34,7 +34,7 @@
         "+i + j * 3 - j % 5;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0418e8cf18ec4ace51cecc0070ed205313e92ac2..e931b75067441dea85e8d8cc511914b06963c019"
+    "shas": "d305b2fcb86de85314b4ea7b59cd65ae41e82abd..97bc63ef3b2a81b78656e006951c9ec5c5e238ee"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-replacement-insert-test",
@@ -89,7 +89,7 @@
         " i + j * 3 - j % 5;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e931b75067441dea85e8d8cc511914b06963c019..41aadd5ed24ead1d8cfed0f50c9b94bf53fd46d6"
+    "shas": "97bc63ef3b2a81b78656e006951c9ec5c5e238ee..cf9bff6a28a147a61c1386c3690821fa1d832498"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-delete-insert-test",
@@ -169,7 +169,7 @@
         " i + j * 3 - j % 5;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "41aadd5ed24ead1d8cfed0f50c9b94bf53fd46d6..df7ea23068df1b6b1cf2f08fad16caaf5d46fefc"
+    "shas": "cf9bff6a28a147a61c1386c3690821fa1d832498..48e0833215918b3fe716f78f0439e9d3ac9faffe"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-replacement-test",
@@ -249,7 +249,7 @@
         " i + j * 3 - j % 5;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "df7ea23068df1b6b1cf2f08fad16caaf5d46fefc..9d073a688fa23ea66f4468ed28a10bfa165dd9b1"
+    "shas": "48e0833215918b3fe716f78f0439e9d3ac9faffe..88f565cef3ef9555051542b3adc913613b4e4f52"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-delete-replacement-test",
@@ -320,7 +320,7 @@
         "+i + j * 2 - j % 4;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9d073a688fa23ea66f4468ed28a10bfa165dd9b1..9e5f2045b4f95e3bc8348c1748d638d4e38960ea"
+    "shas": "88f565cef3ef9555051542b3adc913613b4e4f52..d86b3b54331889435fabb2347140ba1ba8de79f4"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-delete-test",
@@ -359,7 +359,7 @@
         " i + j * 2 - j % 4;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9e5f2045b4f95e3bc8348c1748d638d4e38960ea..1c13b3a5d6e0787ed69116e4cebb1115366a8f21"
+    "shas": "d86b3b54331889435fabb2347140ba1ba8de79f4..da506a786b9acd6e2492bbad3c3379af7ad006be"
 }
 ,{
     "testCaseDescription": "javascript-math-operator-delete-rest-test",
@@ -397,5 +397,5 @@
         "-i + j * 2 - j % 4;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1c13b3a5d6e0787ed69116e4cebb1115366a8f21..60e56ee717443319fd06b7b25a02393835ad25e4"
+    "shas": "da506a786b9acd6e2492bbad3c3379af7ad006be..3f6c1b75b51ab00da9af216249484caf26091581"
 }]
diff --git a/test/corpus/diff-summaries/javascript/member-access-assignment.json b/test/corpus/diff-summaries/javascript/member-access-assignment.json
index f66a13135..8115ac7d9 100644
--- a/test/corpus/diff-summaries/javascript/member-access-assignment.json
+++ b/test/corpus/diff-summaries/javascript/member-access-assignment.json
@@ -34,7 +34,7 @@
         "+y.x = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "02c7c57f6900a26076acb665ba4fc51a55fc79db..dcb111ad800e0ef13a9d25afb0df15b85a4af7f4"
+    "shas": "38c5c9b8a781f4e7cc4870b14cf6308c470f3429..dfc83ef48d655d133fb0a55458c1366156d5dcd5"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-replacement-insert-test",
@@ -89,7 +89,7 @@
         " y.x = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "dcb111ad800e0ef13a9d25afb0df15b85a4af7f4..111fb2a07e2c44c853d1043081d6c01dc35d7b52"
+    "shas": "dfc83ef48d655d133fb0a55458c1366156d5dcd5..2f1292654405588ee8f5af6f5d32a6fe41f199d4"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-delete-insert-test",
@@ -142,7 +142,7 @@
         " y.x = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "111fb2a07e2c44c853d1043081d6c01dc35d7b52..b2fa2205d78e4eed99ec8646f82b3546e5a63f61"
+    "shas": "2f1292654405588ee8f5af6f5d32a6fe41f199d4..d5b3572c9cd7b0d71be1d1c4f3e4b27b0aa18a19"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-replacement-test",
@@ -195,7 +195,7 @@
         " y.x = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b2fa2205d78e4eed99ec8646f82b3546e5a63f61..af9ba3a3f5cc6ba22e4136dc9829bb0313bd851c"
+    "shas": "d5b3572c9cd7b0d71be1d1c4f3e4b27b0aa18a19..6e9736b04aed1ded937466eb5b8819c96538b6ae"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+y.x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "af9ba3a3f5cc6ba22e4136dc9829bb0313bd851c..cb3945414365ac621dd6beef922186250074a2e3"
+    "shas": "6e9736b04aed1ded937466eb5b8819c96538b6ae..686d31ecb7b8177914e9e9f17ba16debddd6fbf3"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-delete-test",
@@ -305,7 +305,7 @@
         " y.x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cb3945414365ac621dd6beef922186250074a2e3..1fa661beacf3ac34a701bd04508b2cc4c9a5b27d"
+    "shas": "686d31ecb7b8177914e9e9f17ba16debddd6fbf3..80996d78a6fe9816eb9e48a5143c6ea7a6856b69"
 }
 ,{
     "testCaseDescription": "javascript-member-access-assignment-delete-rest-test",
@@ -343,5 +343,5 @@
         "-y.x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1fa661beacf3ac34a701bd04508b2cc4c9a5b27d..c19769fba6e7c7042d1ab1915c3f9bb20d569e22"
+    "shas": "80996d78a6fe9816eb9e48a5143c6ea7a6856b69..4f4ca4d777cec4816fc7903df7a6f611fff474ce"
 }]
diff --git a/test/corpus/diff-summaries/javascript/member-access.json b/test/corpus/diff-summaries/javascript/member-access.json
index 6b48082d7..6392d0f55 100644
--- a/test/corpus/diff-summaries/javascript/member-access.json
+++ b/test/corpus/diff-summaries/javascript/member-access.json
@@ -34,7 +34,7 @@
         "+x.someProperty;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "545e1f49b6e82b725cda79df3dea34555ffa1d7c..1d85812b95b56a1c7c862073890d7166d0238a6d"
+    "shas": "3ec83ab3d4454bf8ab6eaf1766606e79e75fdf4c..aa4ec5d840935494fce118bd41353549d0cdbbf8"
 }
 ,{
     "testCaseDescription": "javascript-member-access-replacement-insert-test",
@@ -89,7 +89,7 @@
         " x.someProperty;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1d85812b95b56a1c7c862073890d7166d0238a6d..67e0cab67998526c3e57878de74f6b5e9595dcc8"
+    "shas": "aa4ec5d840935494fce118bd41353549d0cdbbf8..d3cc313b46cc25cb09913b017581322ba11d1701"
 }
 ,{
     "testCaseDescription": "javascript-member-access-delete-insert-test",
@@ -142,7 +142,7 @@
         " x.someProperty;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "67e0cab67998526c3e57878de74f6b5e9595dcc8..df2400e47caf131a690aee596165efd80632b006"
+    "shas": "d3cc313b46cc25cb09913b017581322ba11d1701..239fe4dae6ad065f0ce7559ae832137be4385543"
 }
 ,{
     "testCaseDescription": "javascript-member-access-replacement-test",
@@ -195,7 +195,7 @@
         " x.someProperty;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "df2400e47caf131a690aee596165efd80632b006..9e8022c2da048071b316908f37d16865e0e16d31"
+    "shas": "239fe4dae6ad065f0ce7559ae832137be4385543..42c2a2c8ffc1f9e92daff27331e9024c2cf7a2a7"
 }
 ,{
     "testCaseDescription": "javascript-member-access-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+x.someOtherProperty"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9e8022c2da048071b316908f37d16865e0e16d31..95a9da83b61ad889f0935ca30e4d9d9648418edb"
+    "shas": "42c2a2c8ffc1f9e92daff27331e9024c2cf7a2a7..2c88d1b7f6db2fa2292f17ba70d2f5c81f59d84f"
 }
 ,{
     "testCaseDescription": "javascript-member-access-delete-test",
@@ -305,7 +305,7 @@
         " x.someOtherProperty"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "95a9da83b61ad889f0935ca30e4d9d9648418edb..e4a6b0b20943de7a301427a59c8df352956ccde7"
+    "shas": "2c88d1b7f6db2fa2292f17ba70d2f5c81f59d84f..13f524d2ecd23e8eae275bb915c62659711e986f"
 }
 ,{
     "testCaseDescription": "javascript-member-access-delete-rest-test",
@@ -343,5 +343,5 @@
         "-x.someOtherProperty"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e4a6b0b20943de7a301427a59c8df352956ccde7..ec6eea34d7c86b61e0a52fbb0b8041553b1d5af7"
+    "shas": "13f524d2ecd23e8eae275bb915c62659711e986f..9df9c3aa803afb96ac83c93c8dcc1ae206dae105"
 }]
diff --git a/test/corpus/diff-summaries/javascript/method-call.json b/test/corpus/diff-summaries/javascript/method-call.json
index 06963246d..f477d53cd 100644
--- a/test/corpus/diff-summaries/javascript/method-call.json
+++ b/test/corpus/diff-summaries/javascript/method-call.json
@@ -34,7 +34,7 @@
         "+object.someMethod(arg1, \"arg2\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2d43584fc8ddc7ca7298a1e0e0a9be013b19f0be..2bbcf16bcb88f302ddaca7d109943bba84599b95"
+    "shas": "7ac818c08ed7e0badc60f225f6a1db12b6876c10..f07c470368dda0b08622e147a64591a14a9f163c"
 }
 ,{
     "testCaseDescription": "javascript-method-call-replacement-insert-test",
@@ -89,7 +89,7 @@
         " object.someMethod(arg1, \"arg2\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2bbcf16bcb88f302ddaca7d109943bba84599b95..e3fe295d1f47af91098115364ebdc6dd4ff9e6b1"
+    "shas": "f07c470368dda0b08622e147a64591a14a9f163c..c297bda9adafb39d18305a150a206915a4eb4d6a"
 }
 ,{
     "testCaseDescription": "javascript-method-call-delete-insert-test",
@@ -142,7 +142,7 @@
         " object.someMethod(arg1, \"arg2\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e3fe295d1f47af91098115364ebdc6dd4ff9e6b1..4010e66029f1b973951d3703b7dec8adf14b1ab1"
+    "shas": "c297bda9adafb39d18305a150a206915a4eb4d6a..3d0c6b728a19077d5ae027c66817c7d2c008fdfa"
 }
 ,{
     "testCaseDescription": "javascript-method-call-replacement-test",
@@ -195,7 +195,7 @@
         " object.someMethod(arg1, \"arg2\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4010e66029f1b973951d3703b7dec8adf14b1ab1..c2d8c113478796e6c6f32362271a715706bd134e"
+    "shas": "3d0c6b728a19077d5ae027c66817c7d2c008fdfa..9ef786702b39599695e9b6094310e252f10c145f"
 }
 ,{
     "testCaseDescription": "javascript-method-call-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+object.someMethod(arg1, \"arg3\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c2d8c113478796e6c6f32362271a715706bd134e..6924af1b5a822155552d2cca2fd7e382a225df77"
+    "shas": "9ef786702b39599695e9b6094310e252f10c145f..55854134d28004d4d4143a3361d185264b8d7366"
 }
 ,{
     "testCaseDescription": "javascript-method-call-delete-test",
@@ -305,7 +305,7 @@
         " object.someMethod(arg1, \"arg3\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6924af1b5a822155552d2cca2fd7e382a225df77..9b85d12b2c7ae6d1352534cd00506196925c7962"
+    "shas": "55854134d28004d4d4143a3361d185264b8d7366..9459037ebf06a74ce9a64a546617fb290c7799fe"
 }
 ,{
     "testCaseDescription": "javascript-method-call-delete-rest-test",
@@ -343,5 +343,5 @@
         "-object.someMethod(arg1, \"arg3\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9b85d12b2c7ae6d1352534cd00506196925c7962..a1cfaadb31d0f0d28d7449d160ba2ed06ec9c6af"
+    "shas": "9459037ebf06a74ce9a64a546617fb290c7799fe..c81796cd087e4f62be538eda89091e76ae3fa5a7"
 }]
diff --git a/test/corpus/diff-summaries/javascript/named-function.json b/test/corpus/diff-summaries/javascript/named-function.json
index 29634ac6e..eed06bb80 100644
--- a/test/corpus/diff-summaries/javascript/named-function.json
+++ b/test/corpus/diff-summaries/javascript/named-function.json
@@ -34,7 +34,7 @@
         "+function myFunction(arg1, arg2) { arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "15e84394f61437f6604f6255ce0c5d818ac3115f..6ea0687fb3c4a13e7c6c685859d2ef572a7cf2a4"
+    "shas": "e2bc5f41752affe43a52e069b9eb8b2a96177c3d..39d91ed8e9d663018f3eca928754c6817bccc7e1"
 }
 ,{
     "testCaseDescription": "javascript-named-function-replacement-insert-test",
@@ -89,7 +89,7 @@
         " function myFunction(arg1, arg2) { arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6ea0687fb3c4a13e7c6c685859d2ef572a7cf2a4..65845b7ccc455c2a3e7ec8c12c7c7715176e6132"
+    "shas": "39d91ed8e9d663018f3eca928754c6817bccc7e1..5db9ac6e8e408333016c40634199e32b87e11743"
 }
 ,{
     "testCaseDescription": "javascript-named-function-delete-insert-test",
@@ -202,7 +202,7 @@
         " function myFunction(arg1, arg2) { arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "65845b7ccc455c2a3e7ec8c12c7c7715176e6132..3ce6b2ab8b35de5577106e7225b24b0cf9578f35"
+    "shas": "5db9ac6e8e408333016c40634199e32b87e11743..a137cdf1491fd4dcd1d2d8488457b0b4268885d6"
 }
 ,{
     "testCaseDescription": "javascript-named-function-replacement-test",
@@ -315,7 +315,7 @@
         " function myFunction(arg1, arg2) { arg2; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3ce6b2ab8b35de5577106e7225b24b0cf9578f35..a9a7b0743ebf205eff6b6462782fb52db98f1b16"
+    "shas": "a137cdf1491fd4dcd1d2d8488457b0b4268885d6..26cbf606ef723c3d86016fdc847b01b8598ea5b8"
 }
 ,{
     "testCaseDescription": "javascript-named-function-delete-replacement-test",
@@ -386,7 +386,7 @@
         "+function anotherFunction() { return false; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a9a7b0743ebf205eff6b6462782fb52db98f1b16..db026024213543071e836f01b6a09784e5d35237"
+    "shas": "26cbf606ef723c3d86016fdc847b01b8598ea5b8..b7e66f951f5e353eea7c2a000d75fb1b48b1d891"
 }
 ,{
     "testCaseDescription": "javascript-named-function-delete-test",
@@ -425,7 +425,7 @@
         " function anotherFunction() { return false; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "db026024213543071e836f01b6a09784e5d35237..74e974f29677930c7734e2d5735cc2b42bf39214"
+    "shas": "b7e66f951f5e353eea7c2a000d75fb1b48b1d891..b4f70929674495233eb104375e3e72b7d49e19a9"
 }
 ,{
     "testCaseDescription": "javascript-named-function-delete-rest-test",
@@ -463,5 +463,5 @@
         "-function anotherFunction() { return false; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "74e974f29677930c7734e2d5735cc2b42bf39214..545e1f49b6e82b725cda79df3dea34555ffa1d7c"
+    "shas": "b4f70929674495233eb104375e3e72b7d49e19a9..3ec83ab3d4454bf8ab6eaf1766606e79e75fdf4c"
 }]
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 025766844..68a819cd8 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
@@ -34,7 +34,7 @@
         "+function f(arg1, arg2) { do { something(arg1); } while (arg2); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0f9353e629ed1d4b50861305cd28aa9667f15b4a..ee19f268662c3911fec89c4454037b9f5ac4cc7c"
+    "shas": "70cf6162f7fd2ac244c6fa15d737d0774e4a8573..927c65eb062891a77d81ea7d721df841577e19bc"
 }
 ,{
     "testCaseDescription": "javascript-nested-do-while-in-function-replacement-insert-test",
@@ -89,7 +89,7 @@
         " function f(arg1, arg2) { do { something(arg1); } while (arg2); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ee19f268662c3911fec89c4454037b9f5ac4cc7c..ede2541397ede9a83a53a0929e7088ddbd01d8a4"
+    "shas": "927c65eb062891a77d81ea7d721df841577e19bc..622d3ead473debf32e9b4567910e996f8376e78f"
 }
 ,{
     "testCaseDescription": "javascript-nested-do-while-in-function-delete-insert-test",
@@ -169,7 +169,7 @@
         " function f(arg1, arg2) { do { something(arg1); } while (arg2); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ede2541397ede9a83a53a0929e7088ddbd01d8a4..d8dc1f46228c9f0f48640548bb42615aa26c00e8"
+    "shas": "622d3ead473debf32e9b4567910e996f8376e78f..537177a54837f185a743e5ef597a1816aeedd3b5"
 }
 ,{
     "testCaseDescription": "javascript-nested-do-while-in-function-replacement-test",
@@ -249,7 +249,7 @@
         " function f(arg1, arg2) { do { something(arg1); } while (arg2); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d8dc1f46228c9f0f48640548bb42615aa26c00e8..27b3672918c4d202ab57a62658c715a7ffe24a72"
+    "shas": "537177a54837f185a743e5ef597a1816aeedd3b5..ea1d96bc194133b907c2f0a34b17279c754411b9"
 }
 ,{
     "testCaseDescription": "javascript-nested-do-while-in-function-delete-replacement-test",
@@ -320,7 +320,7 @@
         "+function f(arg1, arg2) { do { something(arg2); } while (arg1); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "27b3672918c4d202ab57a62658c715a7ffe24a72..a98f8cbc1a27c923c69b91a16e665661d99b278b"
+    "shas": "ea1d96bc194133b907c2f0a34b17279c754411b9..bee9ae3f7c290e5e030495e708808b03ce6c547f"
 }
 ,{
     "testCaseDescription": "javascript-nested-do-while-in-function-delete-test",
@@ -359,7 +359,7 @@
         " function f(arg1, arg2) { do { something(arg2); } while (arg1); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a98f8cbc1a27c923c69b91a16e665661d99b278b..2178857dfccf14e6705a2d50e6824cb61f69164a"
+    "shas": "bee9ae3f7c290e5e030495e708808b03ce6c547f..92f5118883df9ee1d8ebb05177479fe27adb0610"
 }
 ,{
     "testCaseDescription": "javascript-nested-do-while-in-function-delete-rest-test",
@@ -397,5 +397,5 @@
         "-function f(arg1, arg2) { do { something(arg2); } while (arg1); }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2178857dfccf14e6705a2d50e6824cb61f69164a..0c5669ab3e40b0ec94a4b0b5eb1047853c0d51b0"
+    "shas": "92f5118883df9ee1d8ebb05177479fe27adb0610..5c937ca5ea01346dc9dd7236aa749f2f7d2df48d"
 }]
diff --git a/test/corpus/diff-summaries/javascript/nested-functions.json b/test/corpus/diff-summaries/javascript/nested-functions.json
index 9dea864ac..b7989c06b 100644
--- a/test/corpus/diff-summaries/javascript/nested-functions.json
+++ b/test/corpus/diff-summaries/javascript/nested-functions.json
@@ -34,7 +34,7 @@
         "+function parent (arg1, arg2) { function child (arg3, arg4) { console.log(arg3); console.log(arg4); } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d03236f8517c53c78b398fe3778c8170b54e36ea..1662b1dfc6d38616da1fff5ad7e6ee911a77e534"
+    "shas": "108691eaf6389b97fcdc69fa9af5ec37ddea808b..c3a11a0227e6d4d42fa561ca575f060a13d75033"
 }
 ,{
     "testCaseDescription": "javascript-nested-functions-replacement-insert-test",
@@ -89,7 +89,7 @@
         " function parent (arg1, arg2) { function child (arg3, arg4) { console.log(arg3); console.log(arg4); } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1662b1dfc6d38616da1fff5ad7e6ee911a77e534..89e96daa71a3e9aeae51bf3d823785ae65027678"
+    "shas": "c3a11a0227e6d4d42fa561ca575f060a13d75033..4b709eafdf287da00d4f5084c8bf3b2d3bab2d21"
 }
 ,{
     "testCaseDescription": "javascript-nested-functions-delete-insert-test",
@@ -169,7 +169,7 @@
         " function parent (arg1, arg2) { function child (arg3, arg4) { console.log(arg3); console.log(arg4); } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "89e96daa71a3e9aeae51bf3d823785ae65027678..c3d4bd3343b7ebd88669f53728aa459003a0dbe2"
+    "shas": "4b709eafdf287da00d4f5084c8bf3b2d3bab2d21..cca15f2395ce3dc993ce67dc7f9fc3312efe580c"
 }
 ,{
     "testCaseDescription": "javascript-nested-functions-replacement-test",
@@ -249,7 +249,7 @@
         " function parent (arg1, arg2) { function child (arg3, arg4) { console.log(arg3); console.log(arg4); } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c3d4bd3343b7ebd88669f53728aa459003a0dbe2..767e6169749beb378d262e0c0c5995dd4d3750de"
+    "shas": "cca15f2395ce3dc993ce67dc7f9fc3312efe580c..085f596ad91bb1a47b50c35ed3cf3ae0db7b8d1a"
 }
 ,{
     "testCaseDescription": "javascript-nested-functions-delete-replacement-test",
@@ -320,7 +320,7 @@
         "+function parent (arg1, arg2) { function child (arg3, arg4) { console.log(arg1); console.log(arg2); } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "767e6169749beb378d262e0c0c5995dd4d3750de..18cd0d93c09a6f185e1f8f5b7ad1aa23e6b067bc"
+    "shas": "085f596ad91bb1a47b50c35ed3cf3ae0db7b8d1a..840c7edf173c9c1f9ba097a480b0f3e2ef916582"
 }
 ,{
     "testCaseDescription": "javascript-nested-functions-delete-test",
@@ -359,7 +359,7 @@
         " function parent (arg1, arg2) { function child (arg3, arg4) { console.log(arg1); console.log(arg2); } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "18cd0d93c09a6f185e1f8f5b7ad1aa23e6b067bc..2380a4af99f945cf851c2a6ffc333adae28ec1a9"
+    "shas": "840c7edf173c9c1f9ba097a480b0f3e2ef916582..e2a8ddc4ab20042304b361e9c3b48bce7439ce30"
 }
 ,{
     "testCaseDescription": "javascript-nested-functions-delete-rest-test",
@@ -397,5 +397,5 @@
         "-function parent (arg1, arg2) { function child (arg3, arg4) { console.log(arg1); console.log(arg2); } }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2380a4af99f945cf851c2a6ffc333adae28ec1a9..0f9353e629ed1d4b50861305cd28aa9667f15b4a"
+    "shas": "e2a8ddc4ab20042304b361e9c3b48bce7439ce30..70cf6162f7fd2ac244c6fa15d737d0774e4a8573"
 }]
diff --git a/test/corpus/diff-summaries/javascript/null.json b/test/corpus/diff-summaries/javascript/null.json
index ca6047848..00ebdd538 100644
--- a/test/corpus/diff-summaries/javascript/null.json
+++ b/test/corpus/diff-summaries/javascript/null.json
@@ -34,7 +34,7 @@
         "+null;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c41b2f9fe0dffe03f83ea0599b2f5fd18a1292a7..18139ee9c6e54664b4d4b5cf6cf0745c941bd15b"
+    "shas": "054726f9e0b21ea91fa413902e88d3f4bdb4af96..07efb30ba1cfa32ec5216643527a0f9e72acb6c0"
 }
 ,{
     "testCaseDescription": "javascript-null-replacement-insert-test",
@@ -89,7 +89,7 @@
         " null;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "18139ee9c6e54664b4d4b5cf6cf0745c941bd15b..612cb0b885b5327b4216f58881116af806208992"
+    "shas": "07efb30ba1cfa32ec5216643527a0f9e72acb6c0..1f16a6e4821f68d84b06a2f5fef8acdd4226ff17"
 }
 ,{
     "testCaseDescription": "javascript-null-delete-insert-test",
@@ -145,7 +145,7 @@
         " null;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "612cb0b885b5327b4216f58881116af806208992..92332e2bee9ed58c9a9f3afcbf1f3cb794a85fe8"
+    "shas": "1f16a6e4821f68d84b06a2f5fef8acdd4226ff17..53ddb9345d037d5adcf1197d2a5d83aa4b5fdb50"
 }
 ,{
     "testCaseDescription": "javascript-null-replacement-test",
@@ -201,7 +201,7 @@
         " null;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "92332e2bee9ed58c9a9f3afcbf1f3cb794a85fe8..f55eef39ebe93820de6b591648d562c2cc6576cb"
+    "shas": "53ddb9345d037d5adcf1197d2a5d83aa4b5fdb50..b79f93d69a1218763535a7465491b7c94f78279f"
 }
 ,{
     "testCaseDescription": "javascript-null-delete-replacement-test",
@@ -272,7 +272,7 @@
         "+return null;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f55eef39ebe93820de6b591648d562c2cc6576cb..40b8cea69b00672cf1932dc403a29d41bfcd77ef"
+    "shas": "b79f93d69a1218763535a7465491b7c94f78279f..6b2d073a04296cede8c257959d2ef3b6ca89c4af"
 }
 ,{
     "testCaseDescription": "javascript-null-delete-test",
@@ -311,7 +311,7 @@
         " return null;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "40b8cea69b00672cf1932dc403a29d41bfcd77ef..7f98ec33735046c6e971f7085277629b43d91027"
+    "shas": "6b2d073a04296cede8c257959d2ef3b6ca89c4af..df9157da4cf63caf9168459fe2cf06383e05da90"
 }
 ,{
     "testCaseDescription": "javascript-null-delete-rest-test",
@@ -349,5 +349,5 @@
         "-return null;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7f98ec33735046c6e971f7085277629b43d91027..96b0b5fed694b8dcfb0566309faee71cfdf4dd60"
+    "shas": "df9157da4cf63caf9168459fe2cf06383e05da90..5b29d374ec36817b00e1ddaef443c76404f2e99a"
 }]
diff --git a/test/corpus/diff-summaries/javascript/number.json b/test/corpus/diff-summaries/javascript/number.json
index fdf9e82f2..16606a8bc 100644
--- a/test/corpus/diff-summaries/javascript/number.json
+++ b/test/corpus/diff-summaries/javascript/number.json
@@ -34,7 +34,7 @@
         "+101"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a721bbb02349218f8c3e5c1b8dff9b250d206fa5..e667b73ca854f58d4845ad175536c28f3da2e510"
+    "shas": "a621bc73d5280fda362985d4f7bcb0e9f5bacd59..f1b4ec1db41d4391fc9a462dd9513b1bc08e5299"
 }
 ,{
     "testCaseDescription": "javascript-number-replacement-insert-test",
@@ -89,7 +89,7 @@
         " 101"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e667b73ca854f58d4845ad175536c28f3da2e510..08aa6df3c760a024f1751290b95883fa444d3eb0"
+    "shas": "f1b4ec1db41d4391fc9a462dd9513b1bc08e5299..3794d30a39309f5b04193bf761d0de3d38418856"
 }
 ,{
     "testCaseDescription": "javascript-number-delete-insert-test",
@@ -142,7 +142,7 @@
         " 101"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "08aa6df3c760a024f1751290b95883fa444d3eb0..8334896eb44c3b974205a8f46531e4e159ef1504"
+    "shas": "3794d30a39309f5b04193bf761d0de3d38418856..8c337f3667d88a8b89004057069c0a89765866cb"
 }
 ,{
     "testCaseDescription": "javascript-number-replacement-test",
@@ -195,7 +195,7 @@
         " 101"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8334896eb44c3b974205a8f46531e4e159ef1504..04ceb913032a5f0b27fcdf436fb725891f846148"
+    "shas": "8c337f3667d88a8b89004057069c0a89765866cb..78d6e47b54b628dc3214bdb5cda6a09c0447dc45"
 }
 ,{
     "testCaseDescription": "javascript-number-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+102"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "04ceb913032a5f0b27fcdf436fb725891f846148..377c9a2a7c7fe0296d90796cb0587e41b24c82df"
+    "shas": "78d6e47b54b628dc3214bdb5cda6a09c0447dc45..05a0fecc9294ecaebbf7071071c7aca2e4627e73"
 }
 ,{
     "testCaseDescription": "javascript-number-delete-test",
@@ -305,7 +305,7 @@
         " 102"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "377c9a2a7c7fe0296d90796cb0587e41b24c82df..71c7b760bba28eadc1ae08039b3c40c12c65fef7"
+    "shas": "05a0fecc9294ecaebbf7071071c7aca2e4627e73..626d5be5bb804b366ac8bf4771c1fa0f82f2190b"
 }
 ,{
     "testCaseDescription": "javascript-number-delete-rest-test",
@@ -343,5 +343,5 @@
         "-102"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "71c7b760bba28eadc1ae08039b3c40c12c65fef7..efab78a691fb93905e88ae443c8324acedc55608"
+    "shas": "626d5be5bb804b366ac8bf4771c1fa0f82f2190b..468b14613b3b5024a481b02a41a4238a142cb2ad"
 }]
diff --git a/test/corpus/diff-summaries/javascript/object.json b/test/corpus/diff-summaries/javascript/object.json
index 9cad4ed60..6c1eb8ab8 100644
--- a/test/corpus/diff-summaries/javascript/object.json
+++ b/test/corpus/diff-summaries/javascript/object.json
@@ -34,7 +34,7 @@
         "+{ \"key1\": \"value1\" };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "abce7caf7e67e197076f10ee997f4a8e08480f93..c701fcab47a5cfe81c6c44a415e62429d18668ec"
+    "shas": "b325b0598f3778c6c970adad5ed229e1b5633f8d..6e964dbb90ad9151d9aebd5ca8518d821258a1a1"
 }
 ,{
     "testCaseDescription": "javascript-object-replacement-insert-test",
@@ -89,7 +89,7 @@
         " { \"key1\": \"value1\" };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c701fcab47a5cfe81c6c44a415e62429d18668ec..c2fc8a1697fb233aacff9572aa9e3cf0ad8bf9df"
+    "shas": "6e964dbb90ad9151d9aebd5ca8518d821258a1a1..b69ba455bef4ae4b5612a1930c9ab087d6ae91ad"
 }
 ,{
     "testCaseDescription": "javascript-object-delete-insert-test",
@@ -145,7 +145,7 @@
         " { \"key1\": \"value1\" };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c2fc8a1697fb233aacff9572aa9e3cf0ad8bf9df..ad2eb5f77d0a45ac8677301606605b3e888da0c9"
+    "shas": "b69ba455bef4ae4b5612a1930c9ab087d6ae91ad..3f7e8f5b73fdff515e7d740eda534328ea0950bf"
 }
 ,{
     "testCaseDescription": "javascript-object-replacement-test",
@@ -201,7 +201,7 @@
         " { \"key1\": \"value1\" };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ad2eb5f77d0a45ac8677301606605b3e888da0c9..143cab3431df1bf47a955baa7bf491ad034f698b"
+    "shas": "3f7e8f5b73fdff515e7d740eda534328ea0950bf..1346acb21a3903114f35976a701a710c2a726c18"
 }
 ,{
     "testCaseDescription": "javascript-object-delete-replacement-test",
@@ -272,7 +272,7 @@
         "+{ \"key1\": \"value1\", \"key2\": \"value2\", \"key3\": \"3.0\" };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "143cab3431df1bf47a955baa7bf491ad034f698b..a32d14229ed7d51190835ad936015498e5bcd9b4"
+    "shas": "1346acb21a3903114f35976a701a710c2a726c18..4307dfc628531711021172e4bc123ddef3a06ff2"
 }
 ,{
     "testCaseDescription": "javascript-object-delete-test",
@@ -311,7 +311,7 @@
         " { \"key1\": \"value1\", \"key2\": \"value2\", \"key3\": \"3.0\" };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a32d14229ed7d51190835ad936015498e5bcd9b4..918bb4a152604b1dbd7b91ec5c16c82cce2f1377"
+    "shas": "4307dfc628531711021172e4bc123ddef3a06ff2..02db0331a089538813735fcf0f1000cd10e96e00"
 }
 ,{
     "testCaseDescription": "javascript-object-delete-rest-test",
@@ -349,5 +349,5 @@
         "-{ \"key1\": \"value1\", \"key2\": \"value2\", \"key3\": \"3.0\" };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "918bb4a152604b1dbd7b91ec5c16c82cce2f1377..784daea9abe5781b5fb045bca826f00e058b0b62"
+    "shas": "02db0331a089538813735fcf0f1000cd10e96e00..b08e38bcc1fe2b06ba9591e2ecf24e8bbc0686b6"
 }]
diff --git a/test/corpus/diff-summaries/javascript/objects-with-methods.json b/test/corpus/diff-summaries/javascript/objects-with-methods.json
index 0c44d0a63..6575d018c 100644
--- a/test/corpus/diff-summaries/javascript/objects-with-methods.json
+++ b/test/corpus/diff-summaries/javascript/objects-with-methods.json
@@ -34,7 +34,7 @@
         "+{ add(a, b) { return a + b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4dbddbfa6c4e016d944aa6ee8ef1acfb4be38af8..14c10158adabf9babb425807cc5a87091d13a4e2"
+    "shas": "000409c2e911d6dfdeffbe87b32d1740473d1424..f589a398b474b90e4290dae8606123354259d1f7"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-replacement-insert-test",
@@ -89,7 +89,7 @@
         " { add(a, b) { return a + b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "14c10158adabf9babb425807cc5a87091d13a4e2..04bc2ca976b3ca9a5e587d32ea23875d9f906d90"
+    "shas": "f589a398b474b90e4290dae8606123354259d1f7..1894b72ede4928ce30a76a70f9bbe76960707c40"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-delete-insert-test",
@@ -169,7 +169,7 @@
         " { add(a, b) { return a + b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "04bc2ca976b3ca9a5e587d32ea23875d9f906d90..66994fec008c1ea8dbacf93bcc5f9c6bcd929ce7"
+    "shas": "1894b72ede4928ce30a76a70f9bbe76960707c40..f4dde9e9b6aaad627c99a204cdaaa4fa398fb8f3"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-replacement-test",
@@ -249,7 +249,7 @@
         " { add(a, b) { return a + b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "66994fec008c1ea8dbacf93bcc5f9c6bcd929ce7..8e236c7111b01c0960041bf367169f651c043c8a"
+    "shas": "f4dde9e9b6aaad627c99a204cdaaa4fa398fb8f3..0c7656da81c66fab008871d83688fe852f76075b"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-delete-replacement-test",
@@ -320,7 +320,7 @@
         "+{ subtract(a, b) { return a - b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8e236c7111b01c0960041bf367169f651c043c8a..3c77bf5f786cc17625ea311ab13bb5fc49256203"
+    "shas": "0c7656da81c66fab008871d83688fe852f76075b..fd49c573e654b696dc7d8a19ce39216e9a8d2b6f"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-delete-test",
@@ -359,7 +359,7 @@
         " { subtract(a, b) { return a - b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3c77bf5f786cc17625ea311ab13bb5fc49256203..0ef207c1ce4c4f71769deb282d5e2269b9ab4bae"
+    "shas": "fd49c573e654b696dc7d8a19ce39216e9a8d2b6f..f11dd851e3adb9423f0767b175917885eceed9d5"
 }
 ,{
     "testCaseDescription": "javascript-objects-with-methods-delete-rest-test",
@@ -397,5 +397,5 @@
         "-{ subtract(a, b) { return a - b; } };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0ef207c1ce4c4f71769deb282d5e2269b9ab4bae..36a730d16dd73b6484407e64d7262f2b1d2260d7"
+    "shas": "f11dd851e3adb9423f0767b175917885eceed9d5..efabaf0ba111348f3605cb95f4e8fd321e43056b"
 }]
diff --git a/test/corpus/diff-summaries/javascript/regex.json b/test/corpus/diff-summaries/javascript/regex.json
index ffdb362ee..d3328ce05 100644
--- a/test/corpus/diff-summaries/javascript/regex.json
+++ b/test/corpus/diff-summaries/javascript/regex.json
@@ -34,7 +34,7 @@
         "+/one/g;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b9d8688abe5c6af76d88562b6f621a4e9c553dee..46137719fcddccc85be5109de5ab82155e4b7bf6"
+    "shas": "7d28b2c7b15b5773e9b7155d94e43f93016632c9..acfcf463eec6b119c89cd4f210674053888ebbb1"
 }
 ,{
     "testCaseDescription": "javascript-regex-replacement-insert-test",
@@ -89,7 +89,7 @@
         " /one/g;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "46137719fcddccc85be5109de5ab82155e4b7bf6..6ae2de8f1464ee028941ff006bcddc6a8e154dc1"
+    "shas": "acfcf463eec6b119c89cd4f210674053888ebbb1..1e8d1679749180a9aadf611c917c1286fe18ebe1"
 }
 ,{
     "testCaseDescription": "javascript-regex-delete-insert-test",
@@ -142,7 +142,7 @@
         " /one/g;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6ae2de8f1464ee028941ff006bcddc6a8e154dc1..b48b7b35c67eec6469cd845444dc26dcaafa608e"
+    "shas": "1e8d1679749180a9aadf611c917c1286fe18ebe1..ae92d42d8177b8b2f445472c84fcf897c6aaafff"
 }
 ,{
     "testCaseDescription": "javascript-regex-replacement-test",
@@ -195,7 +195,7 @@
         " /one/g;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b48b7b35c67eec6469cd845444dc26dcaafa608e..1276e4cc252d792491815c41102b4e2044fc55cb"
+    "shas": "ae92d42d8177b8b2f445472c84fcf897c6aaafff..d848fe889a1081978dcaa5fa94523495845bc535"
 }
 ,{
     "testCaseDescription": "javascript-regex-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+/on[^/]afe/gim;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1276e4cc252d792491815c41102b4e2044fc55cb..045307a264efad53fdebe6dfcf29e4479cb1dc41"
+    "shas": "d848fe889a1081978dcaa5fa94523495845bc535..2d2def645c4652a00a6c63d8ec7d36dde0239377"
 }
 ,{
     "testCaseDescription": "javascript-regex-delete-test",
@@ -305,7 +305,7 @@
         " /on[^/]afe/gim;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "045307a264efad53fdebe6dfcf29e4479cb1dc41..8ac6858f8b302bf8667082d5cd86f97974852eb1"
+    "shas": "2d2def645c4652a00a6c63d8ec7d36dde0239377..eb36a9c9929d2ba37b5a27d49322ee85f2046a97"
 }
 ,{
     "testCaseDescription": "javascript-regex-delete-rest-test",
@@ -343,5 +343,5 @@
         "-/on[^/]afe/gim;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8ac6858f8b302bf8667082d5cd86f97974852eb1..218c2bd7314aff78af0e6556d8eed307360c25c2"
+    "shas": "eb36a9c9929d2ba37b5a27d49322ee85f2046a97..83655892f9e9d2eee70e56c2adffd7594548e463"
 }]
diff --git a/test/corpus/diff-summaries/javascript/relational-operator.json b/test/corpus/diff-summaries/javascript/relational-operator.json
index 6042c6dd6..da8f5c758 100644
--- a/test/corpus/diff-summaries/javascript/relational-operator.json
+++ b/test/corpus/diff-summaries/javascript/relational-operator.json
@@ -34,7 +34,7 @@
         "+x < y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ef8d4296ee2dfe27245e4697b092bcf81f14acce..ab5c59e8e3311a3c5d43efa676f20a6273b72f76"
+    "shas": "389d96d89899599c19ba846b326ad23bd0ebf628..5e6288f454645e52cfa8df9946088c6e3c42f1bb"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-replacement-insert-test",
@@ -89,7 +89,7 @@
         " x < y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ab5c59e8e3311a3c5d43efa676f20a6273b72f76..9b186a7e12610f5a263512f5f8fa6fcf6f4df01f"
+    "shas": "5e6288f454645e52cfa8df9946088c6e3c42f1bb..b52f33bac8b60686b21ed0c812267bcf64f8066c"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-delete-insert-test",
@@ -142,7 +142,7 @@
         " x < y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9b186a7e12610f5a263512f5f8fa6fcf6f4df01f..0a77eff6d853ff69a1ce66772d3d9dff1cd5c895"
+    "shas": "b52f33bac8b60686b21ed0c812267bcf64f8066c..7e692ca38739d98779680e62ecd122546e01a040"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-replacement-test",
@@ -195,7 +195,7 @@
         " x < y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0a77eff6d853ff69a1ce66772d3d9dff1cd5c895..d728ea5b16531558f3d1391ce6279c4599caa1b7"
+    "shas": "7e692ca38739d98779680e62ecd122546e01a040..b9a5061a7495bf81e3258e8cb6857e402e4e8607"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+x <= y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d728ea5b16531558f3d1391ce6279c4599caa1b7..3aa9a1bc32c00263d45abf456580afc308b8e88c"
+    "shas": "b9a5061a7495bf81e3258e8cb6857e402e4e8607..a64489795d2752b78de0add49874b09ae190a248"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-delete-test",
@@ -305,7 +305,7 @@
         " x <= y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3aa9a1bc32c00263d45abf456580afc308b8e88c..dab41c75b5e4f67cdb36643cab90f3929f866590"
+    "shas": "a64489795d2752b78de0add49874b09ae190a248..6fc7633abd56a9a91660944737eef0dde8b099f2"
 }
 ,{
     "testCaseDescription": "javascript-relational-operator-delete-rest-test",
@@ -343,5 +343,5 @@
         "-x <= y;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "dab41c75b5e4f67cdb36643cab90f3929f866590..c320f90e127c691529e4c298d3ff3969a0483c8e"
+    "shas": "6fc7633abd56a9a91660944737eef0dde8b099f2..45467bfb48246946f982ba93b62baaa10e72db4f"
 }]
diff --git a/test/corpus/diff-summaries/javascript/return-statement.json b/test/corpus/diff-summaries/javascript/return-statement.json
index 18eecee5f..9abeeeb2f 100644
--- a/test/corpus/diff-summaries/javascript/return-statement.json
+++ b/test/corpus/diff-summaries/javascript/return-statement.json
@@ -34,7 +34,7 @@
         "+return 5;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ee66417eb88b151832b600af9c2b381b2e52880e..aa418fc5f074d8c3bb6bbb729d2c8d1eceb1875c"
+    "shas": "74e038f85a6296e615673af5f418b547515cc536..efa3cdda9dee12663a6d7518a01ea501110df47e"
 }
 ,{
     "testCaseDescription": "javascript-return-statement-replacement-insert-test",
@@ -89,7 +89,7 @@
         " return 5;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "aa418fc5f074d8c3bb6bbb729d2c8d1eceb1875c..2afaee871a0c64ba9c55f647027d98991976c10f"
+    "shas": "efa3cdda9dee12663a6d7518a01ea501110df47e..3af958df7ed08a1e5a2f760709449ec62ce8edaf"
 }
 ,{
     "testCaseDescription": "javascript-return-statement-delete-insert-test",
@@ -130,7 +130,7 @@
         " return 5;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2afaee871a0c64ba9c55f647027d98991976c10f..de7c548b96662f8ae90dcea647f158ae616b9eec"
+    "shas": "3af958df7ed08a1e5a2f760709449ec62ce8edaf..d3ccaab0d03da0d329560250ae57d3dcbf0011fc"
 }
 ,{
     "testCaseDescription": "javascript-return-statement-replacement-test",
@@ -171,7 +171,7 @@
         " return 5;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "de7c548b96662f8ae90dcea647f158ae616b9eec..9765bd3a9c9400c89a35c43cf69edfb1ac1457b4"
+    "shas": "d3ccaab0d03da0d329560250ae57d3dcbf0011fc..41add55a0169ce54f600eb8c03a31d22dcb31448"
 }
 ,{
     "testCaseDescription": "javascript-return-statement-delete-replacement-test",
@@ -242,7 +242,7 @@
         "+return;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9765bd3a9c9400c89a35c43cf69edfb1ac1457b4..4e8eba1e08dd23e884d13dce01a6f7e4c8d00534"
+    "shas": "41add55a0169ce54f600eb8c03a31d22dcb31448..9cbcb196bc29c51ccf77088b2e5afbe7bde49c71"
 }
 ,{
     "testCaseDescription": "javascript-return-statement-delete-test",
@@ -281,7 +281,7 @@
         " return;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4e8eba1e08dd23e884d13dce01a6f7e4c8d00534..7f8ecfe4b7989470ce44c39f8b788196e5c88e94"
+    "shas": "9cbcb196bc29c51ccf77088b2e5afbe7bde49c71..13935f4f1b57f04d70c2411d6a74ce6cbaeca54c"
 }
 ,{
     "testCaseDescription": "javascript-return-statement-delete-rest-test",
@@ -319,5 +319,5 @@
         "-return;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7f8ecfe4b7989470ce44c39f8b788196e5c88e94..074b11388910f403aab4a975e06626792b23aca4"
+    "shas": "13935f4f1b57f04d70c2411d6a74ce6cbaeca54c..b3deb3a5a3360720b67281c15ada09f11f1bde35"
 }]
diff --git a/test/corpus/diff-summaries/javascript/string.json b/test/corpus/diff-summaries/javascript/string.json
index 3496f3638..a534c982f 100644
--- a/test/corpus/diff-summaries/javascript/string.json
+++ b/test/corpus/diff-summaries/javascript/string.json
@@ -34,7 +34,7 @@
         "+'A string with \"double\" quotes';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "36a730d16dd73b6484407e64d7262f2b1d2260d7..1870b80862e625d4963fcaa20734fd9e45e20b4b"
+    "shas": "efabaf0ba111348f3605cb95f4e8fd321e43056b..fdc7fabbe428bb8e01d4deb852240c84d28efd3d"
 }
 ,{
     "testCaseDescription": "javascript-string-replacement-insert-test",
@@ -89,7 +89,7 @@
         " 'A string with \"double\" quotes';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1870b80862e625d4963fcaa20734fd9e45e20b4b..29cc0e75eae8279de23094b6b5111fd42a20cde1"
+    "shas": "fdc7fabbe428bb8e01d4deb852240c84d28efd3d..c209abc4e81c276a05ac4cda121b45a2622a9ef5"
 }
 ,{
     "testCaseDescription": "javascript-string-delete-insert-test",
@@ -142,7 +142,7 @@
         " 'A string with \"double\" quotes';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "29cc0e75eae8279de23094b6b5111fd42a20cde1..0f0c962bf6fc4d1b7110477438f0fd2e1ecec140"
+    "shas": "c209abc4e81c276a05ac4cda121b45a2622a9ef5..39526b36e15e3ba5a3f24bed560812d6749f122c"
 }
 ,{
     "testCaseDescription": "javascript-string-replacement-test",
@@ -195,7 +195,7 @@
         " 'A string with \"double\" quotes';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0f0c962bf6fc4d1b7110477438f0fd2e1ecec140..abb4de29b8899e7bd340bd31ee4d983dc9f9cc4d"
+    "shas": "39526b36e15e3ba5a3f24bed560812d6749f122c..06ececc9f1544cbaf996e3997a5aa61d66ec375d"
 }
 ,{
     "testCaseDescription": "javascript-string-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+'A different string with \"double\" quotes';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "abb4de29b8899e7bd340bd31ee4d983dc9f9cc4d..84c90dfe58c7824e22891e9142af453d51539c74"
+    "shas": "06ececc9f1544cbaf996e3997a5aa61d66ec375d..9b4edcb5436f2cecaf242dc30d6f353845a77978"
 }
 ,{
     "testCaseDescription": "javascript-string-delete-test",
@@ -305,7 +305,7 @@
         " 'A different string with \"double\" quotes';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "84c90dfe58c7824e22891e9142af453d51539c74..8d96017389b1ffa96fed6b292a41d61654733899"
+    "shas": "9b4edcb5436f2cecaf242dc30d6f353845a77978..b86a73d10196684aba0b8fadaef468e64ac5abfc"
 }
 ,{
     "testCaseDescription": "javascript-string-delete-rest-test",
@@ -343,5 +343,5 @@
         "-'A different string with \"double\" quotes';"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8d96017389b1ffa96fed6b292a41d61654733899..a721bbb02349218f8c3e5c1b8dff9b250d206fa5"
+    "shas": "b86a73d10196684aba0b8fadaef468e64ac5abfc..a621bc73d5280fda362985d4f7bcb0e9f5bacd59"
 }]
diff --git a/test/corpus/diff-summaries/javascript/subscript-access-assignment.json b/test/corpus/diff-summaries/javascript/subscript-access-assignment.json
index b190e8ec7..cb00e5994 100644
--- a/test/corpus/diff-summaries/javascript/subscript-access-assignment.json
+++ b/test/corpus/diff-summaries/javascript/subscript-access-assignment.json
@@ -34,7 +34,7 @@
         "+y[\"x\"] = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c19769fba6e7c7042d1ab1915c3f9bb20d569e22..0cc920fcb9a611b8c6e75c061f71bba36f375f9a"
+    "shas": "4f4ca4d777cec4816fc7903df7a6f611fff474ce..1e52cf45a5e2a0f6ee8e0921267a0634a316157b"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-assignment-replacement-insert-test",
@@ -89,7 +89,7 @@
         " y[\"x\"] = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0cc920fcb9a611b8c6e75c061f71bba36f375f9a..cb74cdb2c35a8d40907b018505d8f1769379b9ca"
+    "shas": "1e52cf45a5e2a0f6ee8e0921267a0634a316157b..3c6333c7f0f59651857bbfcbf290d9bd5833f3cb"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-assignment-delete-insert-test",
@@ -142,7 +142,7 @@
         " y[\"x\"] = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cb74cdb2c35a8d40907b018505d8f1769379b9ca..ce47993610b84c23c5956f7a598d1cc3218bdcb3"
+    "shas": "3c6333c7f0f59651857bbfcbf290d9bd5833f3cb..36cd3e4d9989c5debf52203fa16b96ad9f8c963f"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-assignment-replacement-test",
@@ -195,7 +195,7 @@
         " y[\"x\"] = 0;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ce47993610b84c23c5956f7a598d1cc3218bdcb3..7edc956052d054a4e5d4474baedbfdccc90ffa26"
+    "shas": "36cd3e4d9989c5debf52203fa16b96ad9f8c963f..56f06883f7b080c98bac4f24c2f99bb78663d8b0"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-assignment-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+y[\"x\"] = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7edc956052d054a4e5d4474baedbfdccc90ffa26..3447577471d7e4fa2ed142ecbdac76674cce1df3"
+    "shas": "56f06883f7b080c98bac4f24c2f99bb78663d8b0..b8856b85e0662fbadcd2f8e50f8db87aaec66823"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-assignment-delete-test",
@@ -305,7 +305,7 @@
         " y[\"x\"] = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3447577471d7e4fa2ed142ecbdac76674cce1df3..93d69fa6cf639f25112e6b738b5fa55f977c2232"
+    "shas": "b8856b85e0662fbadcd2f8e50f8db87aaec66823..114d902325a225b663b4521c6a375775771ff98e"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-assignment-delete-rest-test",
@@ -343,5 +343,5 @@
         "-y[\"x\"] = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "93d69fa6cf639f25112e6b738b5fa55f977c2232..e49b80d7752e9f991ddcb2ff2a8c5f714d9bafa3"
+    "shas": "114d902325a225b663b4521c6a375775771ff98e..c746d23108ac9d5c3f3c54c2409565a484b5e709"
 }]
diff --git a/test/corpus/diff-summaries/javascript/subscript-access-string.json b/test/corpus/diff-summaries/javascript/subscript-access-string.json
index edbe4a64e..3097acbae 100644
--- a/test/corpus/diff-summaries/javascript/subscript-access-string.json
+++ b/test/corpus/diff-summaries/javascript/subscript-access-string.json
@@ -34,7 +34,7 @@
         "+x[\"some-string\"];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e8224a02e3ba0dc00add706c1568127b3ae6182b..e878b0903340b2a3a3be042f0aefa185e1c58975"
+    "shas": "1b52e8673612cc64132cdcab5cf668f2511975af..7a305d839fe590015a047ef72408fe648788dbc1"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-string-replacement-insert-test",
@@ -89,7 +89,7 @@
         " x[\"some-string\"];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e878b0903340b2a3a3be042f0aefa185e1c58975..756f52d1fdddba9fa5e751771af7be483b30d6a4"
+    "shas": "7a305d839fe590015a047ef72408fe648788dbc1..1504bbec751e4f2ba62dbce3dc593c2b0162c7b4"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-string-delete-insert-test",
@@ -142,7 +142,7 @@
         " x[\"some-string\"];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "756f52d1fdddba9fa5e751771af7be483b30d6a4..ec75e0ed9547f53ff2d7f8cc5212df280baa113f"
+    "shas": "1504bbec751e4f2ba62dbce3dc593c2b0162c7b4..6b6fc82891c67d371a3030de1c4d7dbd01acaba7"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-string-replacement-test",
@@ -195,7 +195,7 @@
         " x[\"some-string\"];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ec75e0ed9547f53ff2d7f8cc5212df280baa113f..fc3172fc3532d111b67ce2c4c8a2d23c85e81ca2"
+    "shas": "6b6fc82891c67d371a3030de1c4d7dbd01acaba7..6ba28fc50c3d179cd3eaa3214ace8c4095dfeb62"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-string-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+x[\"some-other-string\"];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "fc3172fc3532d111b67ce2c4c8a2d23c85e81ca2..d38478e3bd000e6b61450308f1bebf319d0c1514"
+    "shas": "6ba28fc50c3d179cd3eaa3214ace8c4095dfeb62..0d43f251669f0e1669cf390f46781b6ba0351c20"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-string-delete-test",
@@ -305,7 +305,7 @@
         " x[\"some-other-string\"];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d38478e3bd000e6b61450308f1bebf319d0c1514..84fa7c277121111c577e65f3f21a09363188c9c4"
+    "shas": "0d43f251669f0e1669cf390f46781b6ba0351c20..23e30b32d217898cc38fbe169611392adf1dbb7e"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-string-delete-rest-test",
@@ -343,5 +343,5 @@
         "-x[\"some-other-string\"];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "84fa7c277121111c577e65f3f21a09363188c9c4..2ceb4d28a0554634451ed82eacdbb44d64ce6d54"
+    "shas": "23e30b32d217898cc38fbe169611392adf1dbb7e..789ce31e3d1a7475a43b8d90357fa2732e9e0f2a"
 }]
diff --git a/test/corpus/diff-summaries/javascript/subscript-access-variable.json b/test/corpus/diff-summaries/javascript/subscript-access-variable.json
index 65ec87be3..d7c7e4225 100644
--- a/test/corpus/diff-summaries/javascript/subscript-access-variable.json
+++ b/test/corpus/diff-summaries/javascript/subscript-access-variable.json
@@ -34,7 +34,7 @@
         "+x[someVariable];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ec6eea34d7c86b61e0a52fbb0b8041553b1d5af7..6dad82818c86126ce330a9cd7c093a76efb8cdaf"
+    "shas": "9df9c3aa803afb96ac83c93c8dcc1ae206dae105..753099997d851950e1f3c656d9f231a8f7ac9e45"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-variable-replacement-insert-test",
@@ -89,7 +89,7 @@
         " x[someVariable];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6dad82818c86126ce330a9cd7c093a76efb8cdaf..8c1c5fde4aa2169750f7d2f703c68e42b471ecf7"
+    "shas": "753099997d851950e1f3c656d9f231a8f7ac9e45..efcd2efe20701bf9e5acd707c528c05ec17b1d26"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-variable-delete-insert-test",
@@ -142,7 +142,7 @@
         " x[someVariable];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8c1c5fde4aa2169750f7d2f703c68e42b471ecf7..53bf9e0f19f42594d579ccbee1163f429a1c14c6"
+    "shas": "efcd2efe20701bf9e5acd707c528c05ec17b1d26..3222e6d2d48562f7e35c45e242f96b2f3906d9fa"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-variable-replacement-test",
@@ -195,7 +195,7 @@
         " x[someVariable];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "53bf9e0f19f42594d579ccbee1163f429a1c14c6..edb73e95c59b9fe91874106f30628ab26c22cbdb"
+    "shas": "3222e6d2d48562f7e35c45e242f96b2f3906d9fa..79b5b46918e00de834ae3e92ae0f5a6806a962fe"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-variable-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+x[someOtherVariable];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "edb73e95c59b9fe91874106f30628ab26c22cbdb..d29bb5ba94f278f6e77172dcbdd30d4fcadebba2"
+    "shas": "79b5b46918e00de834ae3e92ae0f5a6806a962fe..03ac4bf9231e76bf62387040df863edb1119af4e"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-variable-delete-test",
@@ -305,7 +305,7 @@
         " x[someOtherVariable];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d29bb5ba94f278f6e77172dcbdd30d4fcadebba2..52c8ed9cb96dc3d7f79305d80304cca93f0c2775"
+    "shas": "03ac4bf9231e76bf62387040df863edb1119af4e..7b5aa0b3c9247996106447e9f238295041043f19"
 }
 ,{
     "testCaseDescription": "javascript-subscript-access-variable-delete-rest-test",
@@ -343,5 +343,5 @@
         "-x[someOtherVariable];"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "52c8ed9cb96dc3d7f79305d80304cca93f0c2775..e8224a02e3ba0dc00add706c1568127b3ae6182b"
+    "shas": "7b5aa0b3c9247996106447e9f238295041043f19..1b52e8673612cc64132cdcab5cf668f2511975af"
 }]
diff --git a/test/corpus/diff-summaries/javascript/switch-statement.json b/test/corpus/diff-summaries/javascript/switch-statement.json
index 607ab82f0..15c5e2231 100644
--- a/test/corpus/diff-summaries/javascript/switch-statement.json
+++ b/test/corpus/diff-summaries/javascript/switch-statement.json
@@ -34,7 +34,7 @@
         "+switch (1) { case 1: 1; case 2: 1; case 3: 3; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "98e620d7e739bab2841281450b4d879405585f38..dca11528b714e0e28922043c278b3b4628089786"
+    "shas": "0e2317b4ac1337d2e6debeeaa18673924f479fbf..789d1512ceec24ff7188e83d24b505e47021a586"
 }
 ,{
     "testCaseDescription": "javascript-switch-statement-replacement-insert-test",
@@ -89,7 +89,7 @@
         " switch (1) { case 1: 1; case 2: 1; case 3: 3; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "dca11528b714e0e28922043c278b3b4628089786..d54fa5ad0bd0b1629be149303f501364ce459d39"
+    "shas": "789d1512ceec24ff7188e83d24b505e47021a586..11fc01f7955f0009030fbdfaea9b1a231c14c4e3"
 }
 ,{
     "testCaseDescription": "javascript-switch-statement-delete-insert-test",
@@ -169,7 +169,7 @@
         " switch (1) { case 1: 1; case 2: 1; case 3: 3; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d54fa5ad0bd0b1629be149303f501364ce459d39..25472c0239ffc946df79545a6d89193906c749e3"
+    "shas": "11fc01f7955f0009030fbdfaea9b1a231c14c4e3..57bb5ac2e0217d1d4e2fa3b18a0aff7070572d5e"
 }
 ,{
     "testCaseDescription": "javascript-switch-statement-replacement-test",
@@ -249,7 +249,7 @@
         " switch (1) { case 1: 1; case 2: 1; case 3: 3; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "25472c0239ffc946df79545a6d89193906c749e3..30a9228a01816745bb3482059382bb8d8a958691"
+    "shas": "57bb5ac2e0217d1d4e2fa3b18a0aff7070572d5e..144e627bb7376f68bd0b7d093f093d3d2e541fc3"
 }
 ,{
     "testCaseDescription": "javascript-switch-statement-delete-replacement-test",
@@ -320,7 +320,7 @@
         "+switch (2) { case 1: 1; case 2: 2; case 3: 3; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "30a9228a01816745bb3482059382bb8d8a958691..3107c424ae4915648b7dd8b8453ae467b7995385"
+    "shas": "144e627bb7376f68bd0b7d093f093d3d2e541fc3..38d8d0c05bebf49b2360290ad83003fbd751a1f2"
 }
 ,{
     "testCaseDescription": "javascript-switch-statement-delete-test",
@@ -359,7 +359,7 @@
         " switch (2) { case 1: 1; case 2: 2; case 3: 3; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3107c424ae4915648b7dd8b8453ae467b7995385..724cc2045ea55f544c52a15b3845b17ad71e8248"
+    "shas": "38d8d0c05bebf49b2360290ad83003fbd751a1f2..7d3dcf7f88945abd8e517cc37e43e540565539ee"
 }
 ,{
     "testCaseDescription": "javascript-switch-statement-delete-rest-test",
@@ -397,5 +397,5 @@
         "-switch (2) { case 1: 1; case 2: 2; case 3: 3; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "724cc2045ea55f544c52a15b3845b17ad71e8248..ceabf504bd808117c5723ab62977a38ed153f0ec"
+    "shas": "7d3dcf7f88945abd8e517cc37e43e540565539ee..17956e21d1861646b9889dabcb733d92e971b9b8"
 }]
diff --git a/test/corpus/diff-summaries/javascript/template-string.json b/test/corpus/diff-summaries/javascript/template-string.json
index cdb7c4a4d..d97f34e12 100644
--- a/test/corpus/diff-summaries/javascript/template-string.json
+++ b/test/corpus/diff-summaries/javascript/template-string.json
@@ -34,7 +34,7 @@
         "+`one line`"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "64dfefbc50b4a2c3c30e706f470afe7dac6fd8b2..2e98d223a00054b95e621ab004bd3633a1dcb43b"
+    "shas": "414acb7061249f3ead467a7957efdb21229fcb7b..7ef760d0e72618b46b73849fdd5429f54f7955a5"
 }
 ,{
     "testCaseDescription": "javascript-template-string-replacement-insert-test",
@@ -89,7 +89,7 @@
         " `one line`"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2e98d223a00054b95e621ab004bd3633a1dcb43b..d742b14e9de2e202b35c442d7c15191ee3d39c2a"
+    "shas": "7ef760d0e72618b46b73849fdd5429f54f7955a5..11a10da340abdada075863f78fbabb57ced56839"
 }
 ,{
     "testCaseDescription": "javascript-template-string-delete-insert-test",
@@ -142,7 +142,7 @@
         " `one line`"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d742b14e9de2e202b35c442d7c15191ee3d39c2a..a467b085be4f17f46b0ae2f24ce6b3007b9ced8f"
+    "shas": "11a10da340abdada075863f78fbabb57ced56839..eec0c69fdab580390821109f96bd92669f2993b2"
 }
 ,{
     "testCaseDescription": "javascript-template-string-replacement-test",
@@ -195,7 +195,7 @@
         " `one line`"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a467b085be4f17f46b0ae2f24ce6b3007b9ced8f..14df5165b08071bd9445f3ab04855d5d19e6f401"
+    "shas": "eec0c69fdab580390821109f96bd92669f2993b2..45420a0c90fd0089fe3d46b53ce122dc333f205d"
 }
 ,{
     "testCaseDescription": "javascript-template-string-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+`multi line`"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "14df5165b08071bd9445f3ab04855d5d19e6f401..3d67dd065db26d02ede23e3d94574b24d2a454df"
+    "shas": "45420a0c90fd0089fe3d46b53ce122dc333f205d..3dcfc1bc3b3b8cca309c95bfc024f21fb78fa9b8"
 }
 ,{
     "testCaseDescription": "javascript-template-string-delete-test",
@@ -305,7 +305,7 @@
         " `multi line`"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3d67dd065db26d02ede23e3d94574b24d2a454df..34315d91dc0fdd1328530c63251a9fea7fad7ce8"
+    "shas": "3dcfc1bc3b3b8cca309c95bfc024f21fb78fa9b8..b95a4e030e3324c3ee0a277adb3484198bf724a6"
 }
 ,{
     "testCaseDescription": "javascript-template-string-delete-rest-test",
@@ -343,5 +343,5 @@
         "-`multi line`"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "34315d91dc0fdd1328530c63251a9fea7fad7ce8..58aa7b1cb85df06bb4b647466c43f5c4862c695f"
+    "shas": "b95a4e030e3324c3ee0a277adb3484198bf724a6..af83ea94ea31585dc756784eea2fcd63e383a994"
 }]
diff --git a/test/corpus/diff-summaries/javascript/ternary.json b/test/corpus/diff-summaries/javascript/ternary.json
index 6e8a5ed2c..bd7b97f0a 100644
--- a/test/corpus/diff-summaries/javascript/ternary.json
+++ b/test/corpus/diff-summaries/javascript/ternary.json
@@ -34,7 +34,7 @@
         "+condition ? case1 : case2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1a9d89c148259dce0124722fcfdce38260c2f1b3..0056a9c72267befe79eb22254b4578eda2718bf6"
+    "shas": "89c1e5f6d5f5059a8f03f24bfc240cb8e14819e9..10045b7df4e8ed9b8851e695c372d11c9f8136b6"
 }
 ,{
     "testCaseDescription": "javascript-ternary-replacement-insert-test",
@@ -89,7 +89,7 @@
         " condition ? case1 : case2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0056a9c72267befe79eb22254b4578eda2718bf6..7f12c13b3e180834c68d4dc2c3d3df3d1d9ac616"
+    "shas": "10045b7df4e8ed9b8851e695c372d11c9f8136b6..14267f9f1c72517a249d2e9b18155c95a6f1e7d6"
 }
 ,{
     "testCaseDescription": "javascript-ternary-delete-insert-test",
@@ -145,7 +145,7 @@
         " condition ? case1 : case2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7f12c13b3e180834c68d4dc2c3d3df3d1d9ac616..288703b7472a15119230c4375ec88b4a24fb6f75"
+    "shas": "14267f9f1c72517a249d2e9b18155c95a6f1e7d6..d6f45255409095714364783878a7a1bf7c6f77d7"
 }
 ,{
     "testCaseDescription": "javascript-ternary-replacement-test",
@@ -201,7 +201,7 @@
         " condition ? case1 : case2;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "288703b7472a15119230c4375ec88b4a24fb6f75..68be2b95c254238bc5ecfa48f609a6ab3d9ce4c9"
+    "shas": "d6f45255409095714364783878a7a1bf7c6f77d7..e2bc6441b9cde0316e6e0a6a06d5b794a1b11244"
 }
 ,{
     "testCaseDescription": "javascript-ternary-delete-replacement-test",
@@ -272,7 +272,7 @@
         "+x.y = some.condition ? some.case : some.other.case;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "68be2b95c254238bc5ecfa48f609a6ab3d9ce4c9..8ec8d97354cf1dd837a8f4a7eec2031de2f19ef5"
+    "shas": "e2bc6441b9cde0316e6e0a6a06d5b794a1b11244..35aefee27d9ca7ac506e0c145862040e53b29d59"
 }
 ,{
     "testCaseDescription": "javascript-ternary-delete-test",
@@ -311,7 +311,7 @@
         " x.y = some.condition ? some.case : some.other.case;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8ec8d97354cf1dd837a8f4a7eec2031de2f19ef5..6480831cc14b65627ccabb4c594a7c9b75da56bc"
+    "shas": "35aefee27d9ca7ac506e0c145862040e53b29d59..0c921b9847515c0864476c33b18021a6c34e8b06"
 }
 ,{
     "testCaseDescription": "javascript-ternary-delete-rest-test",
@@ -349,5 +349,5 @@
         "-x.y = some.condition ? some.case : some.other.case;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6480831cc14b65627ccabb4c594a7c9b75da56bc..a6666c092404c291708b96e94dd932f6d3f8d7f3"
+    "shas": "0c921b9847515c0864476c33b18021a6c34e8b06..7150e8ef5a90badbf859f39483516d0b8c1740b9"
 }]
diff --git a/test/corpus/diff-summaries/javascript/this-expression.json b/test/corpus/diff-summaries/javascript/this-expression.json
index fceb86d9d..58137ab21 100644
--- a/test/corpus/diff-summaries/javascript/this-expression.json
+++ b/test/corpus/diff-summaries/javascript/this-expression.json
@@ -34,7 +34,7 @@
         "+this;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "11c817d08ac0cb3edac35eedef4ad8f04b290d77..946eafe6841a17df1464b56d3b30aa5f9944e2fb"
+    "shas": "be8a925f9e9f750a7a1e6b9f98b88d2754a5fbd1..1db1dd1918477760649da35f36fd4ff183f17d2d"
 }
 ,{
     "testCaseDescription": "javascript-this-expression-replacement-insert-test",
@@ -89,7 +89,7 @@
         " this;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "946eafe6841a17df1464b56d3b30aa5f9944e2fb..8c3b8b8aee5025d5a62a85f79a55c6205ad675a7"
+    "shas": "1db1dd1918477760649da35f36fd4ff183f17d2d..c752c240bc0abe49f49c39d02591d15b0ef3710a"
 }
 ,{
     "testCaseDescription": "javascript-this-expression-delete-insert-test",
@@ -145,7 +145,7 @@
         " this;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8c3b8b8aee5025d5a62a85f79a55c6205ad675a7..5c8b79b64a6c8a13b973b23438aa04b4ee272307"
+    "shas": "c752c240bc0abe49f49c39d02591d15b0ef3710a..591324a6fcf3e8582fffdb701618319e07516f0a"
 }
 ,{
     "testCaseDescription": "javascript-this-expression-replacement-test",
@@ -201,7 +201,7 @@
         " this;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5c8b79b64a6c8a13b973b23438aa04b4ee272307..a24710509652274cdb4fa3260595ac6f5537510f"
+    "shas": "591324a6fcf3e8582fffdb701618319e07516f0a..0708e717a970643700b0684de5ced287ec2d7d9b"
 }
 ,{
     "testCaseDescription": "javascript-this-expression-delete-replacement-test",
@@ -272,7 +272,7 @@
         "+return this;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a24710509652274cdb4fa3260595ac6f5537510f..c2aa0794e99a16952284bad9e79987ac5fb93d4f"
+    "shas": "0708e717a970643700b0684de5ced287ec2d7d9b..2cc0c8f850602f63540a1910762df536d6189ce1"
 }
 ,{
     "testCaseDescription": "javascript-this-expression-delete-test",
@@ -311,7 +311,7 @@
         " return this;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c2aa0794e99a16952284bad9e79987ac5fb93d4f..a4ccea192771f0d5226b4c8f895318cd656e8be8"
+    "shas": "2cc0c8f850602f63540a1910762df536d6189ce1..543dd78b7ab2d31864cc7b3cf4381421599d718e"
 }
 ,{
     "testCaseDescription": "javascript-this-expression-delete-rest-test",
@@ -349,5 +349,5 @@
         "-return this;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a4ccea192771f0d5226b4c8f895318cd656e8be8..c41b2f9fe0dffe03f83ea0599b2f5fd18a1292a7"
+    "shas": "543dd78b7ab2d31864cc7b3cf4381421599d718e..054726f9e0b21ea91fa413902e88d3f4bdb4af96"
 }]
diff --git a/test/corpus/diff-summaries/javascript/throw-statement.json b/test/corpus/diff-summaries/javascript/throw-statement.json
index 8641add53..5ee6ef3f4 100644
--- a/test/corpus/diff-summaries/javascript/throw-statement.json
+++ b/test/corpus/diff-summaries/javascript/throw-statement.json
@@ -34,7 +34,7 @@
         "+throw new Error(\"uh oh\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ceabf504bd808117c5723ab62977a38ed153f0ec..f61c5b9277192b23b4f628e41d0c1f0be8fb3af4"
+    "shas": "17956e21d1861646b9889dabcb733d92e971b9b8..cf39638ade9867e9974ea3c3fad93a2ee9c4f54d"
 }
 ,{
     "testCaseDescription": "javascript-throw-statement-replacement-insert-test",
@@ -89,7 +89,7 @@
         " throw new Error(\"uh oh\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f61c5b9277192b23b4f628e41d0c1f0be8fb3af4..aa47f72c1b1466fc99f2a700da0751a62a47ec94"
+    "shas": "cf39638ade9867e9974ea3c3fad93a2ee9c4f54d..add8fb4fcc048f8a801b8289f6eb2f361e23c103"
 }
 ,{
     "testCaseDescription": "javascript-throw-statement-delete-insert-test",
@@ -142,7 +142,7 @@
         " throw new Error(\"uh oh\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "aa47f72c1b1466fc99f2a700da0751a62a47ec94..26773f48167d08ece295290b48b3fac475a0ccb9"
+    "shas": "add8fb4fcc048f8a801b8289f6eb2f361e23c103..40fe3ac182ddf3a88dc7ef665d1b70e3723eaf09"
 }
 ,{
     "testCaseDescription": "javascript-throw-statement-replacement-test",
@@ -195,7 +195,7 @@
         " throw new Error(\"uh oh\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "26773f48167d08ece295290b48b3fac475a0ccb9..b8827826ec0259bb4bc39c6d94bec55dd27160ba"
+    "shas": "40fe3ac182ddf3a88dc7ef665d1b70e3723eaf09..08c635f704e68cc18f808699180fd8c6496574c0"
 }
 ,{
     "testCaseDescription": "javascript-throw-statement-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+throw new Error(\"oooooops\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b8827826ec0259bb4bc39c6d94bec55dd27160ba..15d3d1ce7799904f611549e0baf136d8a7e1d82f"
+    "shas": "08c635f704e68cc18f808699180fd8c6496574c0..fc212721f8221945f2f6708e9dc9227921a07dec"
 }
 ,{
     "testCaseDescription": "javascript-throw-statement-delete-test",
@@ -305,7 +305,7 @@
         " throw new Error(\"oooooops\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "15d3d1ce7799904f611549e0baf136d8a7e1d82f..af0b5f44b5bcebda992399da45b7f72fbd0a39de"
+    "shas": "fc212721f8221945f2f6708e9dc9227921a07dec..aa64ac386c378677f740b0935d04eeb1005e6fad"
 }
 ,{
     "testCaseDescription": "javascript-throw-statement-delete-rest-test",
@@ -343,5 +343,5 @@
         "-throw new Error(\"oooooops\");"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "af0b5f44b5bcebda992399da45b7f72fbd0a39de..7868df4cf3fd89e485b2f29ce8f215068a325f5f"
+    "shas": "aa64ac386c378677f740b0935d04eeb1005e6fad..461b605183f686ba676d9063774ae43b0eb2a053"
 }]
diff --git a/test/corpus/diff-summaries/javascript/true.json b/test/corpus/diff-summaries/javascript/true.json
index c39f7e9d2..cc13f583e 100644
--- a/test/corpus/diff-summaries/javascript/true.json
+++ b/test/corpus/diff-summaries/javascript/true.json
@@ -34,7 +34,7 @@
         "+true;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "519ad14821c401c1cca201f2a2b02cb503bbfd83..c01ba167634e4d5a7fb703acf8769be0c3626f64"
+    "shas": "5db7a2e323276320f8fea7ae12bf5adf6f3de09d..32bbeeab4afcec15ee798d2d73692cc106fff00c"
 }
 ,{
     "testCaseDescription": "javascript-true-replacement-insert-test",
@@ -89,7 +89,7 @@
         " true;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c01ba167634e4d5a7fb703acf8769be0c3626f64..d167fa08021f842e0798378a5e88903abcf965ce"
+    "shas": "32bbeeab4afcec15ee798d2d73692cc106fff00c..f4928cf97fa401611caee5914b4e5a4550ddd694"
 }
 ,{
     "testCaseDescription": "javascript-true-delete-insert-test",
@@ -145,7 +145,7 @@
         " true;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d167fa08021f842e0798378a5e88903abcf965ce..b34442089140e04e79424144e5383ff642833488"
+    "shas": "f4928cf97fa401611caee5914b4e5a4550ddd694..4e6d60943ea30ced72c9172f1d49e7254690685e"
 }
 ,{
     "testCaseDescription": "javascript-true-replacement-test",
@@ -201,7 +201,7 @@
         " true;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "b34442089140e04e79424144e5383ff642833488..cb20b615113ca3c491298499f3825342588615c3"
+    "shas": "4e6d60943ea30ced72c9172f1d49e7254690685e..949c6b0f9d975812098515ff1ac96a7faf1a28f8"
 }
 ,{
     "testCaseDescription": "javascript-true-delete-replacement-test",
@@ -272,7 +272,7 @@
         "+return true;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cb20b615113ca3c491298499f3825342588615c3..e484b1e463ee4e5b2f74935ef01d15c994aee747"
+    "shas": "949c6b0f9d975812098515ff1ac96a7faf1a28f8..cc44a02106a3782361e684c45bc07495d3894400"
 }
 ,{
     "testCaseDescription": "javascript-true-delete-test",
@@ -311,7 +311,7 @@
         " return true;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e484b1e463ee4e5b2f74935ef01d15c994aee747..5091b3e63579acc77cb30365da02dbe7557c9742"
+    "shas": "cc44a02106a3782361e684c45bc07495d3894400..0e7bb2677a437f1e70090fea5b5ed773622784e3"
 }
 ,{
     "testCaseDescription": "javascript-true-delete-rest-test",
@@ -349,5 +349,5 @@
         "-return true;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5091b3e63579acc77cb30365da02dbe7557c9742..3404e2f9981f841657789983a30885db1872d717"
+    "shas": "0e7bb2677a437f1e70090fea5b5ed773622784e3..551ca9fdcba5734d73b3d1f9ce9a19e373fbaeb6"
 }]
diff --git a/test/corpus/diff-summaries/javascript/try-statement.json b/test/corpus/diff-summaries/javascript/try-statement.json
index f92431832..0b074c83a 100644
--- a/test/corpus/diff-summaries/javascript/try-statement.json
+++ b/test/corpus/diff-summaries/javascript/try-statement.json
@@ -34,7 +34,7 @@
         "+try { f; } catch { g; } finally { h; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7868df4cf3fd89e485b2f29ce8f215068a325f5f..5ecb27a4efc41c0ba83e29c564af9c82956fca9e"
+    "shas": "461b605183f686ba676d9063774ae43b0eb2a053..fc8b483be4ad307e22d146c252bf74b6c78d84b9"
 }
 ,{
     "testCaseDescription": "javascript-try-statement-replacement-insert-test",
@@ -89,7 +89,7 @@
         " try { f; } catch { g; } finally { h; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5ecb27a4efc41c0ba83e29c564af9c82956fca9e..d122a59462ad0be5a56561e7afdc6efecb3e6eae"
+    "shas": "fc8b483be4ad307e22d146c252bf74b6c78d84b9..70d40343bbc67b9bc6abceb2f2e9e1e5748abce3"
 }
 ,{
     "testCaseDescription": "javascript-try-statement-delete-insert-test",
@@ -169,7 +169,7 @@
         " try { f; } catch { g; } finally { h; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "d122a59462ad0be5a56561e7afdc6efecb3e6eae..fbb14de7eb2a4e456bc39a562ffbc3f80cba7556"
+    "shas": "70d40343bbc67b9bc6abceb2f2e9e1e5748abce3..4def8151eced4dbdb05b1ae30e31e743b9893c38"
 }
 ,{
     "testCaseDescription": "javascript-try-statement-replacement-test",
@@ -249,7 +249,7 @@
         " try { f; } catch { g; } finally { h; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "fbb14de7eb2a4e456bc39a562ffbc3f80cba7556..e95c3010e454ee6d775fc67d787959670ebdd093"
+    "shas": "4def8151eced4dbdb05b1ae30e31e743b9893c38..0da3eae155db4ed9796d32cdcf9f691e68b14a11"
 }
 ,{
     "testCaseDescription": "javascript-try-statement-delete-replacement-test",
@@ -320,7 +320,7 @@
         "+try { f; } catch { h; } finally { g; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e95c3010e454ee6d775fc67d787959670ebdd093..61a1515e2ce6e1b47e445d3d792399c50ace173f"
+    "shas": "0da3eae155db4ed9796d32cdcf9f691e68b14a11..8d3227ccb67ca522e112ca3b5582290b00342236"
 }
 ,{
     "testCaseDescription": "javascript-try-statement-delete-test",
@@ -359,7 +359,7 @@
         " try { f; } catch { h; } finally { g; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "61a1515e2ce6e1b47e445d3d792399c50ace173f..3c936e5a29f439a385c56e97af53bd5b0ca92532"
+    "shas": "8d3227ccb67ca522e112ca3b5582290b00342236..821ed957f831b20296f9f5b9c7ff474741a09389"
 }
 ,{
     "testCaseDescription": "javascript-try-statement-delete-rest-test",
@@ -397,5 +397,5 @@
         "-try { f; } catch { h; } finally { g; };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3c936e5a29f439a385c56e97af53bd5b0ca92532..b9d8688abe5c6af76d88562b6f621a4e9c553dee"
+    "shas": "821ed957f831b20296f9f5b9c7ff474741a09389..7d28b2c7b15b5773e9b7155d94e43f93016632c9"
 }]
diff --git a/test/corpus/diff-summaries/javascript/type-operator.json b/test/corpus/diff-summaries/javascript/type-operator.json
index 08d170346..e2c9e50b5 100644
--- a/test/corpus/diff-summaries/javascript/type-operator.json
+++ b/test/corpus/diff-summaries/javascript/type-operator.json
@@ -34,7 +34,7 @@
         "+typeof x;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a6666c092404c291708b96e94dd932f6d3f8d7f3..c56cc7aa435002e6882e9e93ffe5e889184e4c98"
+    "shas": "7150e8ef5a90badbf859f39483516d0b8c1740b9..646fff0adc3c20cec44935b9a8530cb01dbabe6f"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-replacement-insert-test",
@@ -89,7 +89,7 @@
         " typeof x;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "c56cc7aa435002e6882e9e93ffe5e889184e4c98..de4f0e28208514814ace58817472f9c8ae13adc2"
+    "shas": "646fff0adc3c20cec44935b9a8530cb01dbabe6f..d812ec2ce9f305b404ae05eb07e4be6cc7fb1639"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-delete-insert-test",
@@ -142,7 +142,7 @@
         " typeof x;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "de4f0e28208514814ace58817472f9c8ae13adc2..25330298f86668c5c0d4efac9bdd1d9f97809061"
+    "shas": "d812ec2ce9f305b404ae05eb07e4be6cc7fb1639..36682d91f9f21c7f32858abf7c78f604ede041a3"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-replacement-test",
@@ -195,7 +195,7 @@
         " typeof x;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "25330298f86668c5c0d4efac9bdd1d9f97809061..0fc72a1ff12fd1fc2aa5a3fd530ad8d6994a8642"
+    "shas": "36682d91f9f21c7f32858abf7c78f604ede041a3..647a9039d978a9b7f9f9e21d062d58ada9534d3a"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+x instanceof String;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "0fc72a1ff12fd1fc2aa5a3fd530ad8d6994a8642..7d2889db0fc05844fa0b463669b57eecffd86d24"
+    "shas": "647a9039d978a9b7f9f9e21d062d58ada9534d3a..f9e7ea7fb1bd77eb4ad3998e48bbd5ca8f544123"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-delete-test",
@@ -305,7 +305,7 @@
         " x instanceof String;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "7d2889db0fc05844fa0b463669b57eecffd86d24..5e6317483ca3c74940b950df894a1fbe3bc4e2b6"
+    "shas": "f9e7ea7fb1bd77eb4ad3998e48bbd5ca8f544123..8e0ebf3c335133a4012bcff981064183e0392e9c"
 }
 ,{
     "testCaseDescription": "javascript-type-operator-delete-rest-test",
@@ -343,5 +343,5 @@
         "-x instanceof String;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5e6317483ca3c74940b950df894a1fbe3bc4e2b6..b3e70bdf3077d7e2f3dee952ec37081e57641fbf"
+    "shas": "8e0ebf3c335133a4012bcff981064183e0392e9c..cdeef24ab3d20893343df51bad02c05c39b1521c"
 }]
diff --git a/test/corpus/diff-summaries/javascript/undefined.json b/test/corpus/diff-summaries/javascript/undefined.json
index 4490728b0..9c7e9542c 100644
--- a/test/corpus/diff-summaries/javascript/undefined.json
+++ b/test/corpus/diff-summaries/javascript/undefined.json
@@ -34,7 +34,7 @@
         "+undefined;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "96b0b5fed694b8dcfb0566309faee71cfdf4dd60..6ab47400bd7d58aef3bf7780d6835556997006e1"
+    "shas": "5b29d374ec36817b00e1ddaef443c76404f2e99a..e6f0ae3d67e0eff5d2a9a36ae9b71c5bb3e88275"
 }
 ,{
     "testCaseDescription": "javascript-undefined-replacement-insert-test",
@@ -89,7 +89,7 @@
         " undefined;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6ab47400bd7d58aef3bf7780d6835556997006e1..e4b1802fe047f8a75e0bc46cd4da315efdf60560"
+    "shas": "e6f0ae3d67e0eff5d2a9a36ae9b71c5bb3e88275..515cdca94fa0fd945d61f0449b767ceebcac3ea0"
 }
 ,{
     "testCaseDescription": "javascript-undefined-delete-insert-test",
@@ -145,7 +145,7 @@
         " undefined;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e4b1802fe047f8a75e0bc46cd4da315efdf60560..4bb9b8d216bafac43c6307eebd5cfe51b4769e39"
+    "shas": "515cdca94fa0fd945d61f0449b767ceebcac3ea0..c66809182708680b2a90df74832def02c57a5990"
 }
 ,{
     "testCaseDescription": "javascript-undefined-replacement-test",
@@ -201,7 +201,7 @@
         " undefined;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "4bb9b8d216bafac43c6307eebd5cfe51b4769e39..6d4c04c9c6972c06d65ba9c83095a168f51e3f95"
+    "shas": "c66809182708680b2a90df74832def02c57a5990..030a5ba301c5ced003b695d988175b393efb8740"
 }
 ,{
     "testCaseDescription": "javascript-undefined-delete-replacement-test",
@@ -272,7 +272,7 @@
         "+return undefined;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "6d4c04c9c6972c06d65ba9c83095a168f51e3f95..11403be2f96636e2cc2cf75b2fe20435a65fe3da"
+    "shas": "030a5ba301c5ced003b695d988175b393efb8740..eb467eaa66bd05de600c7bce70227081ff2dbb43"
 }
 ,{
     "testCaseDescription": "javascript-undefined-delete-test",
@@ -311,7 +311,7 @@
         " return undefined;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "11403be2f96636e2cc2cf75b2fe20435a65fe3da..f58ac582dcfbebc2199f32e97efbd82e4711f00f"
+    "shas": "eb467eaa66bd05de600c7bce70227081ff2dbb43..262fa201e847e6099945f5141c824203b51f0a7b"
 }
 ,{
     "testCaseDescription": "javascript-undefined-delete-rest-test",
@@ -349,5 +349,5 @@
         "-return undefined;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f58ac582dcfbebc2199f32e97efbd82e4711f00f..519ad14821c401c1cca201f2a2b02cb503bbfd83"
+    "shas": "262fa201e847e6099945f5141c824203b51f0a7b..5db7a2e323276320f8fea7ae12bf5adf6f3de09d"
 }]
diff --git a/test/corpus/diff-summaries/javascript/var-declaration.json b/test/corpus/diff-summaries/javascript/var-declaration.json
index 9413317f8..d647211ea 100644
--- a/test/corpus/diff-summaries/javascript/var-declaration.json
+++ b/test/corpus/diff-summaries/javascript/var-declaration.json
@@ -16,7 +16,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x' variable"
+                    "summary": "Added the 'x' var assignment"
                 }
             ]
         },
@@ -34,7 +34,7 @@
         "+var x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "074b11388910f403aab4a975e06626792b23aca4..a702ccd30aed98e5ff899c18985dec20177ba75a"
+    "shas": "b3deb3a5a3360720b67281c15ada09f11f1bde35..3004be8d009c45ddc97c6423c513c0a47b49c82d"
 }
 ,{
     "testCaseDescription": "javascript-var-declaration-replacement-insert-test",
@@ -69,7 +69,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'y' variable"
+                    "summary": "Added the 'y' var assignment"
                 },
                 {
                     "span": {
@@ -99,7 +99,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'x' variable"
+                    "summary": "Added the 'x' var assignment"
                 }
             ]
         },
@@ -119,7 +119,7 @@
         " var x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a702ccd30aed98e5ff899c18985dec20177ba75a..dedf9eb86128863958baa2c719eee2c2365fd38f"
+    "shas": "3004be8d009c45ddc97c6423c513c0a47b49c82d..c4877ded849d4d14cbc585235842d7803b73afca"
 }
 ,{
     "testCaseDescription": "javascript-var-declaration-delete-insert-test",
@@ -128,30 +128,33 @@
             "var-declaration.js": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    5
-                                ],
-                                "end": [
-                                    1,
-                                    6
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    5
-                                ],
-                                "end": [
-                                    1,
-                                    10
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                1,
+                                5
+                            ],
+                            "end": [
+                                1,
+                                10
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'x' variable with the 'x' variable"
+                    "summary": "Added the 'x' var assignment"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                5
+                            ],
+                            "end": [
+                                1,
+                                6
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'x' variable"
                 },
                 {
                     "span": {
@@ -166,7 +169,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'y' variable"
+                    "summary": "Deleted the 'y' var assignment"
                 },
                 {
                     "span": {
@@ -202,7 +205,7 @@
         " var x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "dedf9eb86128863958baa2c719eee2c2365fd38f..3ac59a2a32659d91ac268d9fdb9128290ef16cfc"
+    "shas": "c4877ded849d4d14cbc585235842d7803b73afca..302816cd527375a91124c62cdcd289020b9fa0b6"
 }
 ,{
     "testCaseDescription": "javascript-var-declaration-replacement-test",
@@ -211,30 +214,18 @@
             "var-declaration.js": [
                 {
                     "span": {
-                        "replace": [
-                            {
-                                "start": [
-                                    1,
-                                    5
-                                ],
-                                "end": [
-                                    1,
-                                    10
-                                ]
-                            },
-                            {
-                                "start": [
-                                    1,
-                                    5
-                                ],
-                                "end": [
-                                    1,
-                                    6
-                                ]
-                            }
-                        ]
+                        "insert": {
+                            "start": [
+                                1,
+                                5
+                            ],
+                            "end": [
+                                1,
+                                6
+                            ]
+                        }
                     },
-                    "summary": "Replaced the 'x' variable with the 'x' variable"
+                    "summary": "Added the 'x' variable"
                 },
                 {
                     "span": {
@@ -249,7 +240,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'y' variable"
+                    "summary": "Added the 'y' var assignment"
                 },
                 {
                     "span": {
@@ -265,6 +256,21 @@
                         }
                     },
                     "summary": "Added the 'z' variable"
+                },
+                {
+                    "span": {
+                        "delete": {
+                            "start": [
+                                1,
+                                5
+                            ],
+                            "end": [
+                                1,
+                                10
+                            ]
+                        }
+                    },
+                    "summary": "Deleted the 'x' var assignment"
                 }
             ]
         },
@@ -285,7 +291,7 @@
         " var x = 1;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "3ac59a2a32659d91ac268d9fdb9128290ef16cfc..8d6a28ccf03158a8e6340a93d09c47328177d318"
+    "shas": "302816cd527375a91124c62cdcd289020b9fa0b6..c8904544791860859cfff9b491bab65d767dc4a3"
 }
 ,{
     "testCaseDescription": "javascript-var-declaration-delete-replacement-test",
@@ -320,7 +326,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'y' variable"
+                    "summary": "Deleted the 'y' var assignment"
                 },
                 {
                     "span": {
@@ -350,7 +356,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x' variable"
+                    "summary": "Deleted the 'x' var assignment"
                 },
                 {
                     "span": {
@@ -380,7 +386,7 @@
                             ]
                         }
                     },
-                    "summary": "Added the 'y' variable"
+                    "summary": "Added the 'y' var assignment"
                 },
                 {
                     "span": {
@@ -416,7 +422,7 @@
         "+var x, y = {}, z;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8d6a28ccf03158a8e6340a93d09c47328177d318..898d568a47e9c92b96c697433e83aaecbfc571ee"
+    "shas": "c8904544791860859cfff9b491bab65d767dc4a3..752382fe70251463146168b2747b51b0eefd7be0"
 }
 ,{
     "testCaseDescription": "javascript-var-declaration-delete-test",
@@ -436,7 +442,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'x' variable"
+                    "summary": "Deleted the 'x' var assignment"
                 }
             ]
         },
@@ -455,7 +461,7 @@
         " var x, y = {}, z;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "898d568a47e9c92b96c697433e83aaecbfc571ee..8e6e21fcf3109e0e23aaeadbabaa26c5b6b65970"
+    "shas": "752382fe70251463146168b2747b51b0eefd7be0..c6b68258c8a1386f81e2eb00955822e69f421f6a"
 }
 ,{
     "testCaseDescription": "javascript-var-declaration-delete-rest-test",
@@ -490,7 +496,7 @@
                             ]
                         }
                     },
-                    "summary": "Deleted the 'y' variable"
+                    "summary": "Deleted the 'y' var assignment"
                 },
                 {
                     "span": {
@@ -523,5 +529,5 @@
         "-var x, y = {}, z;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8e6e21fcf3109e0e23aaeadbabaa26c5b6b65970..b2dce4d2365759cf652927b76a86ca88c71cb3ad"
+    "shas": "c6b68258c8a1386f81e2eb00955822e69f421f6a..4e9add9e716058fa4021b730dad2e7f1fa8ffc7a"
 }]
diff --git a/test/corpus/diff-summaries/javascript/variable.json b/test/corpus/diff-summaries/javascript/variable.json
index 8bc05ac6f..54fc262c9 100644
--- a/test/corpus/diff-summaries/javascript/variable.json
+++ b/test/corpus/diff-summaries/javascript/variable.json
@@ -34,7 +34,7 @@
         "+theVar;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "efab78a691fb93905e88ae443c8324acedc55608..696f6d22c1e72a2cdecc55ae3385117149afa6ae"
+    "shas": "468b14613b3b5024a481b02a41a4238a142cb2ad..379df5ef152dc78583e03e7f322a1e22b9658be7"
 }
 ,{
     "testCaseDescription": "javascript-variable-replacement-insert-test",
@@ -89,7 +89,7 @@
         " theVar;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "696f6d22c1e72a2cdecc55ae3385117149afa6ae..ec5880708208b82b42936cf282184ed5b5d09540"
+    "shas": "379df5ef152dc78583e03e7f322a1e22b9658be7..f3b2f024a1cb3a1866cdf62e8baaf6c41c501952"
 }
 ,{
     "testCaseDescription": "javascript-variable-delete-insert-test",
@@ -142,7 +142,7 @@
         " theVar;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ec5880708208b82b42936cf282184ed5b5d09540..2d42dd988af2506cd2c2bf5745d0330eb566a9f9"
+    "shas": "f3b2f024a1cb3a1866cdf62e8baaf6c41c501952..aa67131dbd7d2ff03dc91f8e7d71d5e80b5e2051"
 }
 ,{
     "testCaseDescription": "javascript-variable-replacement-test",
@@ -195,7 +195,7 @@
         " theVar;"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "2d42dd988af2506cd2c2bf5745d0330eb566a9f9..cb6bcd8e70905a2a894234ded659efd79401549f"
+    "shas": "aa67131dbd7d2ff03dc91f8e7d71d5e80b5e2051..81c4960101a796152a8b0cb693b860586d1db81f"
 }
 ,{
     "testCaseDescription": "javascript-variable-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+theVar2"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cb6bcd8e70905a2a894234ded659efd79401549f..83e306ef5a0e9632ea0510c7ae6bc93e87aa515e"
+    "shas": "81c4960101a796152a8b0cb693b860586d1db81f..34f0672cddeaead5fc951921257919fc9c9010e9"
 }
 ,{
     "testCaseDescription": "javascript-variable-delete-test",
@@ -305,7 +305,7 @@
         " theVar2"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "83e306ef5a0e9632ea0510c7ae6bc93e87aa515e..9616b1bcc7b2849be638e757ef8ee23dfdefa3ec"
+    "shas": "34f0672cddeaead5fc951921257919fc9c9010e9..514c37ffaafc018830f635a7a7ed6e4a63b6b594"
 }
 ,{
     "testCaseDescription": "javascript-variable-delete-rest-test",
@@ -343,5 +343,5 @@
         "-theVar2"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "9616b1bcc7b2849be638e757ef8ee23dfdefa3ec..2e3b3e74fb24767ec84840379177e8834c44714f"
+    "shas": "514c37ffaafc018830f635a7a7ed6e4a63b6b594..6fafed165d4a88fcc9e2b3dba7371aeadee185e4"
 }]
diff --git a/test/corpus/diff-summaries/javascript/void-operator.json b/test/corpus/diff-summaries/javascript/void-operator.json
index a2bf74ef0..a52298a3b 100644
--- a/test/corpus/diff-summaries/javascript/void-operator.json
+++ b/test/corpus/diff-summaries/javascript/void-operator.json
@@ -34,7 +34,7 @@
         "+void b()"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "788020560a8fdb300dff202c696815f281416456..dc92b964674c0dc509386941bd2d45bf1f91dc94"
+    "shas": "a06758561604cc1a81d1b788effb727feba31d2d..9a829de25c7653065b570db5cd8506daaa372347"
 }
 ,{
     "testCaseDescription": "javascript-void-operator-replacement-insert-test",
@@ -89,7 +89,7 @@
         " void b()"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "dc92b964674c0dc509386941bd2d45bf1f91dc94..832e094bb5fed9529d10252fb117c51b09953266"
+    "shas": "9a829de25c7653065b570db5cd8506daaa372347..a03e5a9046c508403788af171946f0907e231efb"
 }
 ,{
     "testCaseDescription": "javascript-void-operator-delete-insert-test",
@@ -142,7 +142,7 @@
         " void b()"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "832e094bb5fed9529d10252fb117c51b09953266..1b85cc3f2c1a8d8f0c70d58ac71f8a73bef4f1cc"
+    "shas": "a03e5a9046c508403788af171946f0907e231efb..ccaf2a3aa2e16d8795595dfec288ced69eb9ee0e"
 }
 ,{
     "testCaseDescription": "javascript-void-operator-replacement-test",
@@ -195,7 +195,7 @@
         " void b()"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "1b85cc3f2c1a8d8f0c70d58ac71f8a73bef4f1cc..ef13ba3f92b4fc71daefbe42bb5a183e86462df1"
+    "shas": "ccaf2a3aa2e16d8795595dfec288ced69eb9ee0e..a134ad2ee257b0d95684a1b4693dafb5fa04c46d"
 }
 ,{
     "testCaseDescription": "javascript-void-operator-delete-replacement-test",
@@ -266,7 +266,7 @@
         "+void c()"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "ef13ba3f92b4fc71daefbe42bb5a183e86462df1..eb8362cf1113ee2a6f38f316ef99c21be01d3998"
+    "shas": "a134ad2ee257b0d95684a1b4693dafb5fa04c46d..1ea3434632ab5d24d0fafe39395098a494ffcf9c"
 }
 ,{
     "testCaseDescription": "javascript-void-operator-delete-test",
@@ -305,7 +305,7 @@
         " void c()"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "eb8362cf1113ee2a6f38f316ef99c21be01d3998..90bb7ed797c75beba669a426a3c6276023b92b83"
+    "shas": "1ea3434632ab5d24d0fafe39395098a494ffcf9c..06ed41876c9e8148d8194e96ada53a432eecf4f6"
 }
 ,{
     "testCaseDescription": "javascript-void-operator-delete-rest-test",
@@ -343,5 +343,5 @@
         "-void c()"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "90bb7ed797c75beba669a426a3c6276023b92b83..e063f0fd0c7f4b192b39469a0e1641349a596147"
+    "shas": "06ed41876c9e8148d8194e96ada53a432eecf4f6..e4d0ee4283c629c4f4db185bd8d0179f42fabd77"
 }]
diff --git a/test/corpus/diff-summaries/javascript/while-statement.json b/test/corpus/diff-summaries/javascript/while-statement.json
index 9e4c7db5f..0078f0041 100644
--- a/test/corpus/diff-summaries/javascript/while-statement.json
+++ b/test/corpus/diff-summaries/javascript/while-statement.json
@@ -34,7 +34,7 @@
         "+while (a) { b(); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a43b37a27c89c6d1f96f5a83f5498c56b9e45338..921c4227b76024fcaabc893c433f997961e2a269"
+    "shas": "d2768fbb95f8527eec1b8d88197c99a65a72c36a..a6cac65239acc0284b66eb80397e6bc4c65c96f5"
 }
 ,{
     "testCaseDescription": "javascript-while-statement-replacement-insert-test",
@@ -89,7 +89,7 @@
         " while (a) { b(); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "921c4227b76024fcaabc893c433f997961e2a269..f74c514c68d3fe1b1d52f848f19f9160cc9cbbfb"
+    "shas": "a6cac65239acc0284b66eb80397e6bc4c65c96f5..2f052a30c1d10801c690105abebe4406c7a8dea2"
 }
 ,{
     "testCaseDescription": "javascript-while-statement-delete-insert-test",
@@ -169,7 +169,7 @@
         " while (a) { b(); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f74c514c68d3fe1b1d52f848f19f9160cc9cbbfb..95f6613fea9dc54d5844d30b98ae5870cdf48573"
+    "shas": "2f052a30c1d10801c690105abebe4406c7a8dea2..bde31ea4480579dad962c6e2b24a3835c05a65b6"
 }
 ,{
     "testCaseDescription": "javascript-while-statement-replacement-test",
@@ -249,7 +249,7 @@
         " while (a) { b(); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "95f6613fea9dc54d5844d30b98ae5870cdf48573..808eca07d620aa12249b3dc5e705216e7f524fed"
+    "shas": "bde31ea4480579dad962c6e2b24a3835c05a65b6..8a55f12e353dbb56bb58503423e5292e8eb2ef0f"
 }
 ,{
     "testCaseDescription": "javascript-while-statement-delete-replacement-test",
@@ -320,7 +320,7 @@
         "+while (b) { a(); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "808eca07d620aa12249b3dc5e705216e7f524fed..a7d9a5e1e7803e5841da84f1009fa272570ba6d5"
+    "shas": "8a55f12e353dbb56bb58503423e5292e8eb2ef0f..25c8ccd3e65a0690d18192dd83c521224e0a2e9f"
 }
 ,{
     "testCaseDescription": "javascript-while-statement-delete-test",
@@ -359,7 +359,7 @@
         " while (b) { a(); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "a7d9a5e1e7803e5841da84f1009fa272570ba6d5..5444eb3ca4168ec227cc4c91dac971751b705304"
+    "shas": "25c8ccd3e65a0690d18192dd83c521224e0a2e9f..0d6c55402ee16483552080027a1b038d8b63a48c"
 }
 ,{
     "testCaseDescription": "javascript-while-statement-delete-rest-test",
@@ -397,5 +397,5 @@
         "-while (b) { a(); };"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5444eb3ca4168ec227cc4c91dac971751b705304..48d3ef87f99a7129141975782e612cef84f46829"
+    "shas": "0d6c55402ee16483552080027a1b038d8b63a48c..9632a8f95e9b8124c8c341c857ef8667269f18d5"
 }]
diff --git a/test/corpus/diff-summaries/javascript/yield.json b/test/corpus/diff-summaries/javascript/yield.json
index c72919274..398581a97 100644
--- a/test/corpus/diff-summaries/javascript/yield.json
+++ b/test/corpus/diff-summaries/javascript/yield.json
@@ -34,7 +34,7 @@
         "+function* foo(){ var index = 0;  }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "f270d7e7af308e5cacc3d7334905fd5f2308dc19..cc9412be0dd1f1f5eddca6f512aa879757063215"
+    "shas": "65b1dacae919ef819dc69ac3d3f38b19becda862..2fb06f7e57fda0df12b839011f11bca7d9c26de7"
 }
 ,{
     "testCaseDescription": "javascript-yield-insert-test",
@@ -73,7 +73,7 @@
         "+function* foo(){ var index = 0; yield i; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "cc9412be0dd1f1f5eddca6f512aa879757063215..e1ce13cacba4d820e4e0bc77a576197e3d3030b2"
+    "shas": "2fb06f7e57fda0df12b839011f11bca7d9c26de7..6438751c25b3c720c4248c09d3fc24ee8e99a1db"
 }
 ,{
     "testCaseDescription": "javascript-yield-replacement-test",
@@ -124,7 +124,7 @@
         "+function* foo(){ var index = 0; yield i++; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "e1ce13cacba4d820e4e0bc77a576197e3d3030b2..5caecd28de588770be0c79798e8d6b3a6c1b1812"
+    "shas": "6438751c25b3c720c4248c09d3fc24ee8e99a1db..5c901405b6df5bbdcc16a2722a86055b10ba60d1"
 }
 ,{
     "testCaseDescription": "javascript-yield-delete-replacement-test",
@@ -175,7 +175,7 @@
         "+function* foo(){ var index = 0; yield i; }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "5caecd28de588770be0c79798e8d6b3a6c1b1812..8b3f9678278a669487ab346c887d6808877845c6"
+    "shas": "5c901405b6df5bbdcc16a2722a86055b10ba60d1..59336ac19aaf04bc8ec5dc3920dd1744e230cdf5"
 }
 ,{
     "testCaseDescription": "javascript-yield-delete-insert-test",
@@ -214,7 +214,7 @@
         "+function* foo(){ var index = 0;  }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "8b3f9678278a669487ab346c887d6808877845c6..05e952680260bc7b3b3229c13a91241e24ae7d79"
+    "shas": "59336ac19aaf04bc8ec5dc3920dd1744e230cdf5..3e01d4e02b2233b56e4dd516d1a433104ca416b1"
 }
 ,{
     "testCaseDescription": "javascript-yield-teardown-test",
@@ -252,5 +252,5 @@
         "-function* foo(){ var index = 0;  }"
     ],
     "gitDir": "test/corpus/repos/javascript",
-    "shas": "05e952680260bc7b3b3229c13a91241e24ae7d79..b325b0598f3778c6c970adad5ed229e1b5633f8d"
+    "shas": "3e01d4e02b2233b56e4dd516d1a433104ca416b1..10fc2ab0c56ed63837031df1a7d650ae75a13b61"
 }]
diff --git a/test/corpus/repos/javascript b/test/corpus/repos/javascript
index b325b0598..10fc2ab0c 160000
--- a/test/corpus/repos/javascript
+++ b/test/corpus/repos/javascript
@@ -1 +1 @@
-Subproject commit b325b0598f3778c6c970adad5ed229e1b5633f8d
+Subproject commit 10fc2ab0c56ed63837031df1a7d650ae75a13b61