diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.0-legacy.zip
index 91d6a134d..38bf5fe28 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.1-legacy.zip
index b9d9d2076..00842e6a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.10-legacy.zip
index 287f7e555..c98c09c53 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.11-legacy.zip
index 431138261..7cc06db46 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.12-compact.zip
index 916022d6a..f13f1bb73 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.12-legacy.zip
index e1e5b3d79..385110b06 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.13-compact.zip
index 9fbc9069f..f7d17d0cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.13-legacy.zip
index eec6b6023..5cc60e606 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.14-compact.zip
index 5fa673a5c..ef8098920 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.14-legacy.zip
index 91ed17269..e213cb8e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.15-compact.zip
index 98bcf050b..77ba3d6f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.15-legacy.zip
index 1ba7ede7f..76f17430e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.16-compact.zip
index 6ac0723b8..1c057b44f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.16-legacy.zip
index 8f6c8053b..572e32cd6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.17-compact.zip
index 0b78298b0..d8c03cf74 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.17-legacy.zip
index 955e2b7cb..c92ddf371 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.18-compact.zip
index ed0e3aa7b..418c2d8de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.18-legacy.zip
index 86194c229..7cec1b6a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.19-compact.zip
index 1b982457f..b94a4123c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.19-legacy.zip
index 6c393cfa1..af12c7952 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.2-legacy.zip
index 7c4008989..12368381f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.20-compact.zip
index 4d610d341..dd3400c2c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.20-legacy.zip
index 5a1a08c04..fc653ae01 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.21-compact.zip
index 0de398c7a..30aaefc0e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.21-legacy.zip
index 15dc7ffb6..435662913 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.22-compact.zip
index 658acc2b7..37390c851 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.22-legacy.zip
index 270fd7b2d..877b47225 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.23-compact.zip
index c3bd9ce86..6fa9a23c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.23-legacy.zip
index 86e697d64..29129f7d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.24-compact.zip
index 5709f5130..6f3630395 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.24-legacy.zip
index dcb843fd5..7843c3b4a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.25-compact.zip
index 557f1a96b..77c4a7b90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.25-legacy.zip
index 54745604f..967652276 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.26-compact.zip
index 9665f9958..b8a0e8d63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.26-legacy.zip
index 2e20dc9ad..be75a2199 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.3-legacy.zip
index b0023845f..e69bd236e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.4-legacy.zip
index 4f9fd341a..ca05d2a94 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.5-legacy.zip
index ccc91e217..0e5e0e890 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.6-legacy.zip
index dc8b7ac31..43ac73966 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.7-legacy.zip
index af48a0628..49e8c2f32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.8-legacy.zip
index ba94e3241..d1ecb4117 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.9-legacy.zip
index e02aa330b..6a6121393 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.0-compact.zip
index 412fa29b5..44e9bd9d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.0-legacy.zip
index 5ef78458f..09f975a7b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.1-compact.zip
index c1a178c34..d93427470 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.1-legacy.zip
index 32ba6346c..acd1a00af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.10-compact.zip
index 3e8933b3a..3ee089981 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.10-legacy.zip
index 93c3f6068..9b06b89a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.11-compact.zip
index b2aa46d60..2a6da9ca7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.11-legacy.zip
index 09fd631c0..3603e7cb4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.12-compact.zip
index 56188ec44..32e0fc9b7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.12-legacy.zip
index bac3cde6e..ee55f8917 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.13-compact.zip
index ad436935c..d2c987b83 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.13-legacy.zip
index 6b575731c..d87eda156 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.14-compact.zip
index ed821b062..c9cbf5aba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.14-legacy.zip
index d7363b8cc..401e3ce08 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.15-compact.zip
index 3abf2b298..398a6066b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.15-legacy.zip
index d0a6334d8..c48a2fb72 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.16-compact.zip
index 53d77d0a8..43ec349c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.16-legacy.zip
index c97a0eff3..910d5bbb3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.17-compact.zip
index e4e8b556a..4031f12ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.17-legacy.zip
index ae10a4008..6b85debfc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.2-compact.zip
index b85520f87..782654e75 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.2-legacy.zip
index 50f206f86..572bd7a51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.3-compact.zip
index 004c320eb..d1d001500 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.3-legacy.zip
index 89bcdd0d0..1e168331d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.4-compact.zip
index 1e0d82640..7f0169d38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.4-legacy.zip
index 262f42c65..bedb6b9bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.5-compact.zip
index c046f4207..4c1765f5f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.5-legacy.zip
index 20e8d98b5..940956939 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.6-compact.zip
index e668e3f96..18b587ec4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.6-legacy.zip
index 236d2a227..9533c1dd1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.7-compact.zip
index aec323d99..31e08e785 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.7-legacy.zip
index 0aafd218a..a881b4508 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.8-compact.zip
index 9c616b937..7dff23d35 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.8-legacy.zip
index ee94b2970..ae990af1d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.9-compact.zip
index 084d6aac6..f93638a45 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.9-legacy.zip
index 32b34e0f9..504da987a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.0-compact.zip
index 3058dbca6..a42e21553 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.0-legacy.zip
index ffdaefeb3..00ff53193 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.1-compact.zip
index 7033579a9..726439802 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.1-legacy.zip
index 2979631c4..c13920372 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.10-compact.zip
index 8e180d71a..7908cd9d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.10-legacy.zip
index 65ac7c958..6333c8041 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.11-compact.zip
index 2fce02cd7..bdc9c1d1b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.11-legacy.zip
index f8840dfcd..643ff6e3a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.12-compact.zip
index c5e01d83f..ead52e8bd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.12-legacy.zip
index ff0c742c1..48fc72e14 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.2-compact.zip
index 875585dea..7045a3e09 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.2-legacy.zip
index 0b67ad13b..3ec77c4a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.3-compact.zip
index 99d3468c5..c124f79a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.3-legacy.zip
index fde27adef..d6beecde5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.4-compact.zip
index e09dc04f2..ed9d076e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.4-legacy.zip
index c1763bd59..cb555390e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.5-compact.zip
index fc2640c06..16ffdea24 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.5-legacy.zip
index f5a82eb25..87bc3f012 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.6-compact.zip
index fbb76045d..80deb4a0d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.6-legacy.zip
index 822f4c12b..28ccc3f66 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.7-compact.zip
index 324d7cee8..c3260e013 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.7-legacy.zip
index 5a25ff028..ce974b780 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.8-compact.zip
index f0ee77158..2f1cb1321 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.8-legacy.zip
index 53dc9b429..fddc625a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.9-compact.zip
index 0068a87b4..c2081e00f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.9-legacy.zip
index cdb2d2d02..4f70ff6c3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.0-compact.zip
index dc388e2f2..23cd2a9f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.0-legacy.zip
index ad451def3..d1a6eb062 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.1-compact.zip
index 81567e45c..576324555 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.1-legacy.zip
index 0e264b72e..65e88f786 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.2-compact.zip
index b274b2558..f7813d986 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.2-legacy.zip
index a0ae29677..85005e433 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.3-compact.zip
index dd9bd2531..5d49834de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.3-legacy.zip
index 00ba1790b..c8ad1fe67 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.4-compact.zip
index 1a03ef961..805a6fb51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.4-legacy.zip
index 3d0bb6ec7..2e34ea318 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.5-compact.zip
index 50dda9738..3469081bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.5-legacy.zip
index 6d7133177..957dfefe4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.6-compact.zip
index a6364c6e1..53bd3290e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.6-legacy.zip
index d5f277e75..a81d0bd62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.0-compact.zip
index 45c48a5d5..99d6b892e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.1-compact.zip
index 614acf453..bb48d5494 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.10-compact.zip
index c745c9a9d..3573bc4cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.11-compact.zip
index 6891c6e0f..efc758106 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.12-compact.zip
index fbb55e067..2f07c93f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.13-compact.zip
index 48c2eefab..123e69c11 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.14-compact.zip
index 45a1a9cc9..1531c8bb5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.15-compact.zip
index c1e1b9d58..a7395de5f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.2-compact.zip
index c67dcfeb1..1a06fc4b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.3-compact.zip
index ce6a17cf9..68e1e5005 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.4-compact.zip
index 6891b902b..c56fe4d46 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.5-compact.zip
index b031ed0cd..6d50486e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.6-compact.zip
index 5951c071a..66e1f0569 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.7-compact.zip
index c3e4a2a7d..6f756b51b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.8-compact.zip
index dce6d37ff..653d43bf0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.9-compact.zip
index 8c37f7b8f..a3fe1afed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assembly-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.0-legacy.zip
index 284f20bf5..aed426057 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.1-legacy.zip
index 4f09f4635..048aa1242 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.10-legacy.zip
index 1159081ae..fdc0092de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.11-legacy.zip
index b447157ad..94828b93b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.12-compact.zip
index 910a72f1f..6435997f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.12-legacy.zip
index dcf8b215b..a2bf4caec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.13-compact.zip
index 39c50efd1..f0f3c21e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.13-legacy.zip
index dfc685f50..7c0753074 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.14-compact.zip
index a36d72f92..d3b352c95 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.14-legacy.zip
index c8c6a434e..d0b62e23c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.15-compact.zip
index 65b61d3c7..8c686c519 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.15-legacy.zip
index 18236e463..ba326245f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.16-compact.zip
index 36f428bdf..e7b507977 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.16-legacy.zip
index f6f227426..3b59e8c97 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.17-compact.zip
index daef80a68..66b0194de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.17-legacy.zip
index 5f859fadb..38f1dc8e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.18-compact.zip
index f6b17aea6..3c5c68d6a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.18-legacy.zip
index 077ececfc..691a29e22 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.19-compact.zip
index 5af6bd545..fc7a81fc6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.19-legacy.zip
index f79a6d400..6a63c11da 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.2-legacy.zip
index 051c96f72..91fcdf0aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.20-compact.zip
index c42195d4b..538c6de6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.20-legacy.zip
index 88f3b0c19..6924b6012 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.21-compact.zip
index b03df07b7..217e3cd80 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.21-legacy.zip
index 6081905cc..505a32049 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.22-compact.zip
index 8c1e97b95..059fe6ff2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.22-legacy.zip
index 8501dc017..9a7e9f900 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.23-compact.zip
index e56c44230..b23b572fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.23-legacy.zip
index a5d0812f8..01a49fed2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.24-compact.zip
index e667c8105..64b3186d9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.24-legacy.zip
index e9f775fc2..947f89cae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.25-compact.zip
index d0e1e0b5c..0b0ee5b44 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.25-legacy.zip
index 7d10f6c05..30e7dabe3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.26-compact.zip
index 90cde7d7d..9ace9687c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.26-legacy.zip
index 6c17d1412..d98c0d9ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.3-legacy.zip
index 3395f180b..7701bd48d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.4-legacy.zip
index f553231ac..0ff701e57 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.5-legacy.zip
index 1d9e6b8d9..0ed93a3dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.6-legacy.zip
index 6e7bef449..6db9f32b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.7-legacy.zip
index 3cf5d344d..a8de0964b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.8-legacy.zip
index 63a5619b4..7a7fc3ca5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.9-legacy.zip
index ad1a5bb0a..433aefa0e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.4.7-legacy.zip
index 7d440f0fb..8dd09e6f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.4.8-legacy.zip
index 9f8f92c5e..dc0064872 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.4.9-legacy.zip
index 4fab034c6..3ac5b9523 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.0-compact.zip
index 7a4692496..1350ed8a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.0-legacy.zip
index 7cbce97b3..7c72bef5e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.1-compact.zip
index c72403664..82fde98c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.1-legacy.zip
index e6b432091..908601bdc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.10-compact.zip
index c699741d9..ded01630c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.10-legacy.zip
index d544adf1e..2b4bb3440 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.11-compact.zip
index 2d5b7538d..0a4d7d13d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.11-legacy.zip
index 7a4a82e96..1d657fde3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.12-compact.zip
index af7006e66..ab19275a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.12-legacy.zip
index 2db95a38d..41959a972 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.13-compact.zip
index 184886adc..27f6390bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.13-legacy.zip
index 05cd8b537..42883f4eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.14-compact.zip
index 5a6dfe3c9..48a7ea975 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.14-legacy.zip
index b18d21b8c..8946ff4c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.15-compact.zip
index cce4a7769..cbad5adbc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.15-legacy.zip
index c238fa26c..0668e7cfa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.16-compact.zip
index e9b8b3e94..238ea2010 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.16-legacy.zip
index 767e016ce..893d546f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.17-compact.zip
index 3a56b9318..c53b3901e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.17-legacy.zip
index 33c4ce4e0..880e329c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.2-compact.zip
index 3c348eeb8..5d2299eec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.2-legacy.zip
index 425b52349..ae05db1f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.3-compact.zip
index f6a7b844b..5647dc1a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.3-legacy.zip
index 942b369d3..27365a257 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.4-compact.zip
index 81060346c..97f6e449e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.4-legacy.zip
index 945e45f8e..554c89f3b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.5-compact.zip
index d6023c5e9..8897065a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.5-legacy.zip
index 7f50143b2..3097c5726 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.6-compact.zip
index f6a713a43..bd6e8c539 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.6-legacy.zip
index 3fd7ce38b..6d9939c62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.7-compact.zip
index 265ee9251..9c0d6556f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.7-legacy.zip
index 7931b2511..4a4381395 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.8-compact.zip
index a6275019c..99e92a940 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.8-legacy.zip
index c9070650b..f7b70d8de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.9-compact.zip
index e86f8de4a..038a5217d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.9-legacy.zip
index 575bbb23b..005605a1b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.0-compact.zip
index b0ae43977..600565995 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.0-legacy.zip
index 2c3356a94..d7e3e5ff2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.1-compact.zip
index 9a59f67dc..75776d6d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.1-legacy.zip
index c8e95c45a..8f6dafafe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.10-compact.zip
index ff0e0206f..2ab62d31c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.10-legacy.zip
index 14e650e24..1116b48ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.11-compact.zip
index 9769a8846..84ad1ae4e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.11-legacy.zip
index 1858be6ff..40daba0fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.12-compact.zip
index aaa2d15e9..31f2bc4e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.12-legacy.zip
index b97e1f7d9..0b895776f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.2-compact.zip
index 64a1b2722..576966f57 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.2-legacy.zip
index c4ecfeb7f..25470f438 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.3-compact.zip
index f98e3a206..edfdfc61c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.3-legacy.zip
index 93f2cac5e..3663e8f17 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.4-compact.zip
index 48326ab9f..8e45c4b07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.4-legacy.zip
index a8de3ef95..f6f5496f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.5-compact.zip
index e59462333..9b83c8c70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.5-legacy.zip
index 9f57ee7b5..1c84bff49 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.6-compact.zip
index 44e9d0142..3ce1679e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.6-legacy.zip
index 3437452e2..d6363a011 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.7-compact.zip
index dabe9870d..6851556a0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.7-legacy.zip
index 1f2585108..2b8a86c84 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.8-compact.zip
index 9c3c69172..06d9a92dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.8-legacy.zip
index 18db049b9..c709d171b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.9-compact.zip
index 6d0c56ef8..7cf2d61f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.9-legacy.zip
index 443022c5a..f5ebd9bed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.0-compact.zip
index 31587f586..504024a51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.0-legacy.zip
index 113447438..8cb1c2e75 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.1-compact.zip
index cfd910069..324d0c4c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.1-legacy.zip
index 61b4212b2..2d8de8a07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.2-compact.zip
index ca3e3a528..cd0d8ddb6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.2-legacy.zip
index 12a575079..477261eb0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.3-compact.zip
index 16380a3cd..a48d03a97 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.3-legacy.zip
index 3d17908ef..0dcfb3148 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.4-compact.zip
index 779f4fb44..e86640c7e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.4-legacy.zip
index 52060f963..719ba9c19 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.5-compact.zip
index eaee672bd..25c3bb355 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.5-legacy.zip
index a5165bc00..5ec091359 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.6-compact.zip
index 9f35f8a8e..331be86f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.6-legacy.zip
index 9bdf346ff..a59661163 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.0-compact.zip
index 92f39c52a..1c34ea009 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.1-compact.zip
index dbd8a6f74..08bfac9bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.10-compact.zip
index d34ddc1ab..e77a56923 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.11-compact.zip
index 2528d5fb3..32d83b33b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.12-compact.zip
index 45e325ab2..d7bec75d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.13-compact.zip
index 56a56a4aa..8c01d4ea0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.14-compact.zip
index fe97cd497..c397a8900 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.15-compact.zip
index 5861d82d6..677f35f54 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.2-compact.zip
index 7e54fe51d..5a4fc0a43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.3-compact.zip
index 81b700c59..1caf72838 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.4-compact.zip
index a5a5ad435..9c123cc66 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.5-compact.zip
index 4740790cf..836806be9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.6-compact.zip
index cd38663f2..9627cf458 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.7-compact.zip
index e73a7698f..0dce558a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.8-compact.zip
index 718f2f4b6..4d8f413fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.9-compact.zip
index 0ecfd7143..a77e88ca6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/assignment-0.4.7.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.0-legacy.zip
index b33dcfb6d..4956318ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.1-legacy.zip
index e30d005c3..77eb12436 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.10-legacy.zip
index d6208b1b6..fd8bb5f2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.11-legacy.zip
index 872ecf9c6..aa0e9144c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.12-compact.zip
index 7cb3afb0d..c9dcc4694 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.12-legacy.zip
index aadda61a4..f50df1ff0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.13-compact.zip
index fb30f34a5..56ed1443a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.13-legacy.zip
index 1fe1316d2..52a6ef60c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.14-compact.zip
index 0c5d897f1..4ae726301 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.14-legacy.zip
index c1231a6cc..6f3b86006 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.15-compact.zip
index fd257553f..00a91bb24 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.15-legacy.zip
index eebc7cda1..998ceec7d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.16-compact.zip
index 72b4e51d7..608472769 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.16-legacy.zip
index ed63d8de9..9a43b2371 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.17-compact.zip
index ab66ee22e..2a8c41dab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.17-legacy.zip
index 1c0462a85..1ecdaa0d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.18-compact.zip
index 54d923d57..17ac04f11 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.18-legacy.zip
index 76d351364..5001a7b56 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.19-compact.zip
index f7a7c665d..ee1dcf52e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.19-legacy.zip
index dd3511d02..0d14ce4b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.2-legacy.zip
index 866dd2213..b05ac3a06 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.20-compact.zip
index 8ead3192e..e416a8aa2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.20-legacy.zip
index 1132a4e81..6df2a6974 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.21-compact.zip
index 6d531ff69..c9ccebc55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.21-legacy.zip
index 28b820d56..376948d61 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.22-compact.zip
index e55d4bd1b..4fc8c392e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.22-legacy.zip
index 72998c765..ce164fe70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.23-compact.zip
index f4d0348cf..c00c826d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.23-legacy.zip
index e73507e7d..cb5baad96 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.24-compact.zip
index b33d916ad..82e5c8649 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.24-legacy.zip
index c2c45aad6..2859e4db7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.25-compact.zip
index c0559a216..1e80277e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.25-legacy.zip
index c49ad30e4..c85ecf4c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.26-compact.zip
index 8cbdfdc15..13cdd013d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.26-legacy.zip
index e0328ae3f..4da6272f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.3-legacy.zip
index 34d7964b3..aa26e572f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.4-legacy.zip
index a6b87f04e..697dd59e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.5-legacy.zip
index 9f41fbe2e..cb7822b64 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.6-legacy.zip
index a99dd4d81..5c59eeaf0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.7-legacy.zip
index 76bfd8524..ca35ea642 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.8-legacy.zip
index 1462c3fc0..967c26198 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.9-legacy.zip
index aec6c17b6..c8c5fbb43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.4.7-legacy.zip
index 452c072e4..077d5aba4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.4.8-legacy.zip
index d815709fc..e6fbb79e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.4.9-legacy.zip
index 3b5619a13..ac3781832 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.0-compact.zip
index 98d6e8890..ef3922a5f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.0-legacy.zip
index fb79df69f..f1faf917d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.1-compact.zip
index acfd08d9f..45f7d8345 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.1-legacy.zip
index 31474428b..26548a890 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.10-compact.zip
index 93383bdaa..f4457e53f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.10-legacy.zip
index d64c83683..6ca2ccea8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.11-compact.zip
index e09c8e744..d586e3052 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.11-legacy.zip
index 6667c7d61..5755a3614 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.12-compact.zip
index 131c498c5..0f2d12f3d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.12-legacy.zip
index 3f7ce502e..b48c74fd6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.13-compact.zip
index 63c895bd3..6facfbf4b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.13-legacy.zip
index cb23e1bde..43d905823 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.14-compact.zip
index 200a3b042..5cdd50357 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.14-legacy.zip
index 6ac403081..22e6cf0fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.15-compact.zip
index 0812d0f5f..a22c011c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.15-legacy.zip
index b1851d7c1..8d8814b24 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.16-compact.zip
index 80f956b3a..b15af59be 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.16-legacy.zip
index 56ce517d1..55d6152fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.17-compact.zip
index 87de597be..1c87acad2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.17-legacy.zip
index 714461f7a..349b938c2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.2-compact.zip
index e5b51f9e4..f8833789f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.2-legacy.zip
index 5ce819a28..ddcc9d1c3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.3-compact.zip
index bea5b36bf..63760012c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.3-legacy.zip
index 0aae25a48..60a6a58d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.4-compact.zip
index d16d36903..d7ee012e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.4-legacy.zip
index d9137b26b..36db7375d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.5-compact.zip
index 86ebc913b..8dd045e42 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.5-legacy.zip
index 8264462eb..d77f37d39 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.6-compact.zip
index 930c12d28..11235e058 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.6-legacy.zip
index 11f4f52a3..f260c236d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.7-compact.zip
index 71f657d33..181a7c847 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.7-legacy.zip
index 5022e637c..6c726010e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.8-compact.zip
index 443ec8207..a505966ad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.8-legacy.zip
index 67d0fe4f4..91c7870c3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.9-compact.zip
index 80012ede2..b1881083e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.9-legacy.zip
index 479006aef..609b469a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.0-compact.zip
index 57a93e27b..fe5183534 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.0-legacy.zip
index 46d33ca4a..8627e3d65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.1-compact.zip
index 28ffac784..ae56e4dbe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.1-legacy.zip
index c45fd1a93..0705db2d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.10-compact.zip
index f4b2829f6..667b21ec9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.10-legacy.zip
index 46c68c556..ab7d2b5dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.11-compact.zip
index 45a2b1d39..fff8c2fdd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.11-legacy.zip
index 80c4a0c7c..ca2287907 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.12-compact.zip
index 1f3ed9b44..38dcd643d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.12-legacy.zip
index 7027f6773..34f1d8fae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.2-compact.zip
index 8d2d0aff3..ccdca7888 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.2-legacy.zip
index cebb8302b..f7c0e390c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.3-compact.zip
index c2bff0ca3..205933ff3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.3-legacy.zip
index 8b4955849..3488a3f0d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.4-compact.zip
index de9c66dac..284273226 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.4-legacy.zip
index 17b9a4d7f..c678d2546 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.5-compact.zip
index 7ae183879..5bde5f4d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.5-legacy.zip
index 4772b218b..337a469e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.6-compact.zip
index 553418a11..256e88af3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.6-legacy.zip
index fe358192a..a73511ff6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.7-compact.zip
index 673b9de41..ac91496f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.7-legacy.zip
index 94bef81be..a5c07bf05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.8-compact.zip
index 71be79bb3..369f91ae8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.8-legacy.zip
index 5a8406cfe..98315d6a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.9-compact.zip
index 433fdc132..57836a7b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.9-legacy.zip
index f42b9dc64..a74dff7fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.0-compact.zip
index d9deb0368..0ed8ff021 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.0-legacy.zip
index f82c0ac19..7f093b9f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.1-compact.zip
index 153353211..3c3a31f6a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.1-legacy.zip
index 440c6d01c..940c95a98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.2-compact.zip
index fe3bebcd0..e1f8b6934 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.2-legacy.zip
index 527ac6b22..ff4bf4399 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.3-compact.zip
index c50e450a6..80539074e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.3-legacy.zip
index af6ed4004..285b0fccc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.4-compact.zip
index 0dfdf8bd2..dca6dfdef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.4-legacy.zip
index 34baf28a7..4ca64a1ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.5-compact.zip
index dacbaa4a3..e7bced74e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.5-legacy.zip
index b41737f93..4355dd4d6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.6-compact.zip
index cbb17f6b8..afcb62409 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.6-legacy.zip
index 7b43dff46..935e58eda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.0-compact.zip
index d6ad8339e..03620fd6e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.1-compact.zip
index d05f5f168..0df477166 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.10-compact.zip
index d79b82c97..71f70ec97 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.11-compact.zip
index 52b287ab3..5dba06eea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.12-compact.zip
index abf721cb2..f5e69bbdd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.2-compact.zip
index a4424c894..af805fc74 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.3-compact.zip
index a4099e42b..9993cc571 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.4-compact.zip
index cff079931..a5499957d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.5-compact.zip
index 276387e21..be8fd0095 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.6-compact.zip
index 2d9695922..e6734b019 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.7-compact.zip
index 8a7646c53..c5cdf72db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.8-compact.zip
index 349875749..776e62676 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.9-compact.zip
index e92369a92..62aa9bb01 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/binaryoperation-0.4.7.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.0-legacy.zip
index 04df9d92c..1eeab50a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.1-legacy.zip
index b08f789b0..02a9f9dd9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.10-legacy.zip
index 108bda5f8..4772adfec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.11-legacy.zip
index 2fc982b56..f7a9d6d9d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.12-compact.zip
index f962f5833..cb9ce99d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.12-legacy.zip
index e1ca95a9b..9bade0110 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.13-compact.zip
index 57251682b..4860cc146 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.13-legacy.zip
index fa82f9bd8..6603e541d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.14-compact.zip
index 44b8c1146..83a0502c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.14-legacy.zip
index c1ac75589..d2a8f4664 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.15-compact.zip
index 3320a7a4e..b5fd8657e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.15-legacy.zip
index 00c8e9dc3..001cfb7a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.16-compact.zip
index 0c8a3a359..4fed93478 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.16-legacy.zip
index 2872f5739..b296114cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.17-compact.zip
index 7fbba693d..f28af9e05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.17-legacy.zip
index b8112c64e..56d800e3d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.18-compact.zip
index 99a3db30d..836eb42d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.18-legacy.zip
index 49340e1d9..9a0e3be22 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.19-compact.zip
index 34abbb1a0..5055d714f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.19-legacy.zip
index 01e1857a8..9a3ce86d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.2-legacy.zip
index 732e60a17..aea55d475 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.20-compact.zip
index 3590968b1..e801954a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.20-legacy.zip
index fe2c90ced..d6be25ebc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.21-compact.zip
index a337f2ff2..95158504e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.21-legacy.zip
index d4044b4c5..5855a047e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.22-compact.zip
index 465ef3884..c90726ef6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.22-legacy.zip
index fe4489a8d..65aa1d97f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.23-compact.zip
index 265ab0864..4d45c6741 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.23-legacy.zip
index 99e662421..3f8ba6b96 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.24-compact.zip
index 34f57ffee..5c7651dcb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.24-legacy.zip
index 503ef0bd2..52c842ea6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.25-compact.zip
index 6a788c043..f04c36b13 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.25-legacy.zip
index 384364b65..973e18c29 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.26-compact.zip
index 95ec96ab9..816724bd4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.26-legacy.zip
index d5e03bb4d..7f61938c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.3-legacy.zip
index e2d6286a1..51b9b98f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.4-legacy.zip
index 8df1dfae8..4c0788d44 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.5-legacy.zip
index 76f7cb8d2..bd2be4ada 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.6-legacy.zip
index efe7019a6..3d92cf4d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.7-legacy.zip
index 496803c5e..98923d2eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.8-legacy.zip
index 304bf4d9d..92248d5f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.9-legacy.zip
index 28508b6dd..475bc005c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.0-compact.zip
index ef752a1e2..07bf5c15e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.0-legacy.zip
index 3719d4e65..7b45731f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.1-compact.zip
index 1d259e49b..46df5434c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.1-legacy.zip
index 8dc26fb4b..38ba2ca2e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.10-compact.zip
index aa5f677f0..9fc87ea2e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.10-legacy.zip
index a970275e6..8f8b7e147 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.11-compact.zip
index 17c0d5bb0..3961d8bbf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.11-legacy.zip
index 7ca87240c..bec981ec2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.12-compact.zip
index 0eb30a7e3..fdc81a623 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.12-legacy.zip
index 018df1b0e..ef2b92669 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.13-compact.zip
index 05f569ba7..403cede79 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.13-legacy.zip
index 6796b99f0..7e00a7b56 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.14-compact.zip
index f000b085c..201ce817a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.14-legacy.zip
index 110b2bb1c..3605f7eba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.15-compact.zip
index e87096e6f..b9f702975 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.15-legacy.zip
index a9d8a8339..04d660a90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.16-compact.zip
index 4622cf40d..c2438267a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.16-legacy.zip
index f3b84092c..66f0d286d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.17-compact.zip
index df5a9f631..a1593a596 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.17-legacy.zip
index 78390bcc6..b307ddb19 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.2-compact.zip
index 88d9c6cf5..41701ade2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.2-legacy.zip
index 6a11960da..cd328b1a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.3-compact.zip
index c5097b579..dcc79de86 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.3-legacy.zip
index 93b193a36..ede8350dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.4-compact.zip
index 98a18fce9..f1c059483 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.4-legacy.zip
index 61bbd7e6a..a77ac476d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.5-compact.zip
index 04fe7ce8e..9cb303339 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.5-legacy.zip
index a39dc2219..74c113072 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.6-compact.zip
index 66bda96f0..dae4fb3f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.6-legacy.zip
index 9d09ad66d..b0dcd30d6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.7-compact.zip
index 823a8b7c9..c5b013ebf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.7-legacy.zip
index 94e53b402..bfd053212 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.8-compact.zip
index 0d6068de5..b58894c95 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.8-legacy.zip
index d4dc51b09..742aef355 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.9-compact.zip
index e19e28183..37f779cda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.9-legacy.zip
index a3e9893f2..f67cb1679 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.0-compact.zip
index 3c884ce23..ab66ea87d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.0-legacy.zip
index 623ea4b26..8282c2f21 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.1-compact.zip
index e4409e497..f07c915dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.1-legacy.zip
index 102f32870..5ff7cfa7a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.10-compact.zip
index e082e0b49..a55c866be 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.10-legacy.zip
index 3a989a0b3..4a03a55b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.11-compact.zip
index 69daaf8cb..049f2b660 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.11-legacy.zip
index 6c755a60d..b4f0920f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.12-compact.zip
index 9642c0b2f..29fcbfaf3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.12-legacy.zip
index bc3f3812c..f9dab4b57 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.2-compact.zip
index d21f8d350..d76289dda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.2-legacy.zip
index 9db416f8c..83e316119 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.3-compact.zip
index db475aa18..d428fdd77 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.3-legacy.zip
index 749729a80..5dd44a363 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.4-compact.zip
index ae42bfeb3..1b89f4c13 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.4-legacy.zip
index fc44ad204..5e79412ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.5-compact.zip
index d9c1d6e81..860c90719 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.5-legacy.zip
index 98513a746..837dd4c1f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.6-compact.zip
index b16c828c5..74a703233 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.6-legacy.zip
index b2f7663f6..f47689b00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.7-compact.zip
index b1d441d1b..aeefac6b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.7-legacy.zip
index ea06b13a3..aa45d021c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.8-compact.zip
index 55658244c..b272a464c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.8-legacy.zip
index 871efe7e3..8de91bba7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.9-compact.zip
index 5de38f8d5..27531a17d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.9-legacy.zip
index b7f4dd61b..49c83293d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.0-compact.zip
index 33254cac4..1712a895a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.0-legacy.zip
index fd65e6534..f196cd9b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.1-compact.zip
index 8c22da8f2..cf96f8f64 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.1-legacy.zip
index 5f39c6d9e..bdc521d86 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.2-compact.zip
index 3f3b465c6..c5114621b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.2-legacy.zip
index a679c6b2d..10fcd2e18 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.3-compact.zip
index a102323ec..46640fcf2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.3-legacy.zip
index 49640e564..47448e87e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.4-compact.zip
index 32dd1a7a7..4777f91d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.4-legacy.zip
index 15b988d5c..df51b32a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.5-compact.zip
index c7392a725..506d93335 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.5-legacy.zip
index f49b5a075..5403e01d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.6-compact.zip
index c7b27cd22..3261b1a57 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.6-legacy.zip
index bf9049c73..812bfeb83 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.0-compact.zip
index 9fe9a9112..9c9fb20c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.1-compact.zip
index 16f09c878..6fe321e8d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.10-compact.zip
index 18fe0976d..1f99a1b30 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.11-compact.zip
index 0874b406a..4f61e831a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.12-compact.zip
index 412bf647f..0cff8b1b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.13-compact.zip
index a627f5cc4..769248001 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.14-compact.zip
index 9f2efe6fa..e046692a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.15-compact.zip
index 33b07f2ec..ebf37b779 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.2-compact.zip
index 0a6bc4b92..cf0b8f8cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.3-compact.zip
index 99360307e..02b25614e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.4-compact.zip
index a3265e870..6b49e3fde 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.5-compact.zip
index 791692e2e..74467f09e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.6-compact.zip
index 997be39fc..b3268812b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.7-compact.zip
index 4f35bb42e..c4b696195 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.8-compact.zip
index 52011a760..f26b2ed51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.9-compact.zip
index b1c03d34f..b74724a81 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/break-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/bytes_call.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/bytes_call.sol-0.8.12-compact.zip
index 8249f6042..95e46cecf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/bytes_call.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/bytes_call.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.0-legacy.zip
index 4ea748fa7..932529bd2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.1-legacy.zip
index 604839f60..eff543d1d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.10-legacy.zip
index 637d5848c..1954621df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.11-legacy.zip
index 2e32c3081..1f60cc120 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.12-compact.zip
index 3b1c8f6ce..98bd8d4e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.12-legacy.zip
index d32066c37..fb260c319 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.13-compact.zip
index 2a3c747a9..7ad2f2d63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.13-legacy.zip
index 553c76261..28e26ef21 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.14-compact.zip
index ec60e21ae..66fbb3368 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.14-legacy.zip
index 7f56422a6..afe303abc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.15-compact.zip
index 76b31a339..d7c353d02 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.15-legacy.zip
index 59f0eb86d..6b6e35371 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.16-compact.zip
index 416e52655..720753981 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.16-legacy.zip
index bdeea6e6d..68f8e0b62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.17-compact.zip
index e68896486..2a1e60eb7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.17-legacy.zip
index a10cc4d7e..6d64a4cfe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.18-compact.zip
index f82970060..3d1f2a4a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.18-legacy.zip
index 9455438d4..78b7a4752 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.19-compact.zip
index 154bbb9bd..2006dc40e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.19-legacy.zip
index 81e855579..9a709e75d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.2-legacy.zip
index 7fa15d54c..945f93723 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.20-compact.zip
index 560360210..f0eb02ef9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.20-legacy.zip
index 1fbcb9c20..a6dc0974e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.21-compact.zip
index 6f3567ff5..305c67f16 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.21-legacy.zip
index ac3ae63f1..d0b507529 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.22-compact.zip
index 3942943d4..f0d64468d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.22-legacy.zip
index da11a58fb..0eee8ff20 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.23-compact.zip
index c1e445f14..8e9e117ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.23-legacy.zip
index 9d3b93387..c026ec500 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.24-compact.zip
index 0026e43a5..9630de411 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.24-legacy.zip
index 551612603..f9266853c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.25-compact.zip
index 936525f84..1866022c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.25-legacy.zip
index a96b75f0d..69210e87e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.26-compact.zip
index c85ea0f5f..7fc8231d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.26-legacy.zip
index d04c44193..3ee74b7f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.3-legacy.zip
index d3763bc84..11f110d08 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.4-legacy.zip
index 468dc50fb..162e7d354 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.5-legacy.zip
index 4cffb018d..69570561a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.6-legacy.zip
index 1c1bcf549..73631f685 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.7-legacy.zip
index b92d06aac..928738ea1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.8-legacy.zip
index a4dcfde86..28cbe8d78 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.9-legacy.zip
index 83e2b41f9..f4c0cb24b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.0-compact.zip
index 2f364ce90..9b93407ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.0-legacy.zip
index 96828cb7f..127a8b269 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.1-compact.zip
index dc59d657d..0eca05586 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.1-legacy.zip
index 06eca1e5b..b77a3f519 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.10-compact.zip
index 8ca7538d4..f28cb7f0c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.10-legacy.zip
index c965d67ae..4ff1ea680 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.11-compact.zip
index e6c6d7c8f..451ea6c66 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.11-legacy.zip
index f55588805..e17f15ba6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.12-compact.zip
index f69276388..73e49e9da 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.12-legacy.zip
index bba86726a..2e85cb5c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.13-compact.zip
index 8d34d9b74..8f3676214 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.13-legacy.zip
index 20480672c..79ad448b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.14-compact.zip
index e1213107a..08560558a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.14-legacy.zip
index c5c33c6d5..2c237145a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.15-compact.zip
index 7db0a7e12..6ea4fc56f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.15-legacy.zip
index 18196c20f..2c7e270ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.16-compact.zip
index 5deb88175..d9c2e02ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.16-legacy.zip
index d3a504580..4315376ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.17-compact.zip
index 750adc6c8..fb5bbf03b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.17-legacy.zip
index 3eaf45b2c..d28e886e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.2-compact.zip
index 66deec7f9..a089eed5e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.2-legacy.zip
index 0ce6eb229..8dd62fa87 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.3-compact.zip
index 6e78e0792..63baa6e68 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.3-legacy.zip
index 08967880e..5958dc125 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.4-compact.zip
index 89e2fbd0a..5d5599138 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.4-legacy.zip
index 7d991781c..5252ca8f2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.5-compact.zip
index 07363fa46..e120f564a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.5-legacy.zip
index c6541ffa0..99b30ce6a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.6-compact.zip
index bd7c201fe..751a31b02 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.6-legacy.zip
index fa307d4dd..2fccd7d4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.7-compact.zip
index 091235975..7b10aa20e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.7-legacy.zip
index a093eff1f..c21c10e3b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.8-compact.zip
index 2d94cb243..ad742b75b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.8-legacy.zip
index fd3607872..990647913 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.9-compact.zip
index f58eb8a5a..b30ef6555 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.9-legacy.zip
index f342d05c1..9e02c17ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.0-compact.zip
index 0bb067c80..56ff64b5f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.0-legacy.zip
index aaa74e9d5..fe52c46bd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.1-compact.zip
index fbf7664c5..0dfa35bfe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.1-legacy.zip
index 7e6f44147..d1fafd839 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.10-compact.zip
index 558fa4a9d..e5f8173e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.10-legacy.zip
index 84bb2aa68..91bc4b032 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.11-compact.zip
index 43cc61c35..7503cb3b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.11-legacy.zip
index bc20e9009..89e7c468a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.12-compact.zip
index 52e317910..a7adc0242 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.12-legacy.zip
index f5c9e541b..0e89d71c3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.2-compact.zip
index 996aa0419..fb2578646 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.2-legacy.zip
index b5835dca0..39b4d1bf5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.3-compact.zip
index a8e516a48..1ee470fe2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.3-legacy.zip
index 4f872ce2e..3690658a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.4-compact.zip
index 1366cb10f..868bab95d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.4-legacy.zip
index 67cdbefcd..8cb91e012 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.5-compact.zip
index 0e1d57898..f5a1678ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.5-legacy.zip
index 40604e0ed..0a22d4587 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.6-compact.zip
index 5dd668c93..8c276ad1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.6-legacy.zip
index 9d671ac15..8e09c47ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.7-compact.zip
index 163b14d1a..5072378d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.7-legacy.zip
index 7c0734791..2e0c3e6ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.8-compact.zip
index d3fc0f840..8c490e5ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.8-legacy.zip
index d745acdf7..00427a97f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.9-compact.zip
index 58d605535..152b8835d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.9-legacy.zip
index 019e696ee..e624ff1e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.0-compact.zip
index 1f9ff657f..66593beb0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.0-legacy.zip
index 8e0d5142b..2f375a58d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.1-compact.zip
index 01b26d2e7..0eb145f4c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.1-legacy.zip
index 803fab60d..2c3dc4b29 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.2-compact.zip
index 7165755d4..925c82b20 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.2-legacy.zip
index 913484319..9525d8cef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.3-compact.zip
index 5c5aa1f11..a3e502f76 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.3-legacy.zip
index 7f13a2ec9..52070f65e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.4-compact.zip
index c761473dc..ce2bb9e2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.4-legacy.zip
index 755290d64..f15e41de5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.5-compact.zip
index c90799257..f2f63b981 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.5-legacy.zip
index 5c7e21dcf..4fd6f029e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.6-compact.zip
index 93661c774..0a4989285 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.6-legacy.zip
index d60ae241b..af5377b8e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.0-compact.zip
index 1053b23b2..ea940e8f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.1-compact.zip
index 6c869aa1c..00673c7ad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.10-compact.zip
index 5923c589b..fe8ffa49c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.11-compact.zip
index 901d95574..572192771 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.12-compact.zip
index e65b263a0..1dcb463d6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.13-compact.zip
index b7b06e703..b3da21684 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.14-compact.zip
index 69f5fe692..35721cb91 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.15-compact.zip
index 664c1b379..217d16e55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.2-compact.zip
index 963e17e56..a05919f84 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.3-compact.zip
index ea0fc2c19..2cc101124 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.4-compact.zip
index 463e1e0d1..f14bc3bbd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.5-compact.zip
index 1a4ccb136..c81058bc4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.6-compact.zip
index b0289ab14..0a1c92293 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.7-compact.zip
index f71c80d56..db5d0e0c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.8-compact.zip
index 6474b02f3..4580cbbb2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.9-compact.zip
index 59c5b1519..913a10c6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/call_to_variable-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.0-legacy.zip
index e9443741d..6fec41f25 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.1-legacy.zip
index f8716e276..015913819 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.10-legacy.zip
index 9261d885a..b5977a22e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.11-legacy.zip
index add845d17..a1ce18371 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.12-compact.zip
index da744cc26..4116d93b7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.12-legacy.zip
index 9edd6b98c..ce1bc39e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.13-compact.zip
index 3f0255ab0..eefc9c6ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.13-legacy.zip
index 52439aab7..df3740cd1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.14-compact.zip
index bfdd49478..c529cd948 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.14-legacy.zip
index 13a0f6ba4..5f1e6bc45 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.15-compact.zip
index 93ba72ad6..473a4460b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.15-legacy.zip
index a03adf02f..1de08c998 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.16-compact.zip
index d7fb19363..0c641e410 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.16-legacy.zip
index 8e19435e6..7d8374d63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.17-compact.zip
index 2448f7312..454b70d23 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.17-legacy.zip
index f2d808901..48c985d49 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.18-compact.zip
index f4e0fe72d..2c3c4cda0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.18-legacy.zip
index d16bd6d84..100ff2190 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.19-compact.zip
index 1808c1875..e1bee275e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.19-legacy.zip
index 2f3729ed1..0b316c79e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.2-legacy.zip
index 3f5520e87..25a94f4f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.20-compact.zip
index d948c9e2e..13ea6ad38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.20-legacy.zip
index 4f99e3c49..d610126b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.21-compact.zip
index 26ed352cf..d2d44dc0b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.21-legacy.zip
index 242519551..f6551ef3d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.22-compact.zip
index c29b71160..123184635 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.22-legacy.zip
index 0ece09d7f..53f9207e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.23-compact.zip
index 358b18b43..10b7849a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.23-legacy.zip
index 267a93ace..b2b084195 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.24-compact.zip
index 225e9562a..c9a4b5ac0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.24-legacy.zip
index 456d0e28a..55290cec9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.25-compact.zip
index b93389e42..1f317542d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.25-legacy.zip
index 05204be99..3d950cd4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.26-compact.zip
index d8afd6c76..2f353de41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.26-legacy.zip
index 8a16d908e..3aaab8fe0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.3-legacy.zip
index dbbbae630..da5904ba9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.4-legacy.zip
index b0f78159b..462cc686d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.5-legacy.zip
index f6ad2f94a..fd3352ff2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.6-legacy.zip
index 08eb82ed4..4ccca1296 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.7-legacy.zip
index 27032c504..5dcbed54f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.8-legacy.zip
index d3decfe79..b88e5bf07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.9-legacy.zip
index 9bfdf3d93..a9e704b55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.0-compact.zip
index 7f2fb81cb..6ae1d0f0b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.0-legacy.zip
index 81535fe79..a79fe6d6d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.1-compact.zip
index e4a495c69..5dd348660 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.1-legacy.zip
index 3eb7faec2..f5d7c2257 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.10-compact.zip
index 2eb931030..c1b4ff73c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.10-legacy.zip
index 40c167679..2f0a8880c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.11-compact.zip
index d6e54b079..a160ff28d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.11-legacy.zip
index 1768ecfac..987f6c5ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.12-compact.zip
index 32350cb03..da2e73f1f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.12-legacy.zip
index 3909e2839..723779846 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.13-compact.zip
index 87c2d1837..913547556 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.13-legacy.zip
index 1eaff9359..86e6eee7a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.14-compact.zip
index 6ef58f496..d3953cdd7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.14-legacy.zip
index c3750af70..3c0985579 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.15-compact.zip
index 1585ffc94..b335e51cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.15-legacy.zip
index 52e173345..23af628ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.16-compact.zip
index 35d71f23b..983ebce4e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.16-legacy.zip
index 10d14f02b..6a0e9cb83 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.17-compact.zip
index c57a7fc67..dec9a4aae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.17-legacy.zip
index b0f661f7f..e65aacf9f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.2-compact.zip
index 6e507bd6c..5df2fa215 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.2-legacy.zip
index 5a2a870e2..0761409cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.3-compact.zip
index 6c643b8b0..29043e87a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.3-legacy.zip
index 957885b76..976642418 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.4-compact.zip
index c9ff2a2cf..964854f8e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.4-legacy.zip
index 94b6e1a4b..c77caad6d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.5-compact.zip
index ba462143f..9b0b7d380 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.5-legacy.zip
index 2ab15db05..c05a95eff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.6-compact.zip
index cc08050ff..91f44bb6e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.6-legacy.zip
index c0e7e2c0d..cd0e824fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.7-compact.zip
index 5e6aedf1d..30b8c7988 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.7-legacy.zip
index 3c9c9c13e..813049b5e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.8-compact.zip
index 7fce14531..90cac281c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.8-legacy.zip
index db0078c1d..62c0405d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.9-compact.zip
index c14753f14..b4ee18d91 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.9-legacy.zip
index 265398716..db220496c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.0-compact.zip
index 587dc6d8c..cef018832 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.0-legacy.zip
index a8ba8fb84..b77b498b7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.1-compact.zip
index f261a1d35..0d1521011 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.1-legacy.zip
index 3e5ce883a..83962570a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.10-compact.zip
index 48ab7d0fb..8c457c8ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.10-legacy.zip
index 122cf3cdf..0ae096457 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.11-compact.zip
index 556546f3a..94b4af214 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.11-legacy.zip
index 9c2aa50af..8ad6e418d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.12-compact.zip
index e0cf74dd6..94270f810 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.12-legacy.zip
index ff318dad3..b4c57bfd7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.2-compact.zip
index ef6e558ca..d75493146 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.2-legacy.zip
index 6392abf2a..4826ab2e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.3-compact.zip
index 77a543989..5bc460593 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.3-legacy.zip
index 86b740378..f31fc5dd2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.4-compact.zip
index 034d96da2..d235c67cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.4-legacy.zip
index 96fb87b61..66b323102 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.5-compact.zip
index 183534ab6..4d1e8ebe3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.5-legacy.zip
index 29d7764a3..47477e1df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.6-compact.zip
index 2049ef2b5..1f9a8493d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.6-legacy.zip
index f67eb784b..047755510 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.7-compact.zip
index 1c1e449f4..51ba8021d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.7-legacy.zip
index 4021a6a01..d01a473db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.8-compact.zip
index 12383b554..247b8340d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.8-legacy.zip
index 15096aa5b..138e521aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.9-compact.zip
index c19b36ff8..1bf39903f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.9-legacy.zip
index 964544219..fb4008baa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.0-compact.zip
index 599679e0e..73013d2de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.0-legacy.zip
index 11672bf3d..a7e1d5470 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.1-compact.zip
index 9ec1461e4..3f67e7649 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.1-legacy.zip
index 63a1f5b1d..45782ea16 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.2-compact.zip
index 2f9645f0a..4450c3baa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.2-legacy.zip
index 964be0837..4e36a635f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.3-compact.zip
index 08b3ff760..aed8be09b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.3-legacy.zip
index 7dd776eda..a02818b62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.4-compact.zip
index 284e7df5e..825ff4d5b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.4-legacy.zip
index c03f60846..fc49309cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.5-compact.zip
index aeffcfd5a..8e42ca25e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.5-legacy.zip
index a50bda0ee..717982906 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.6-compact.zip
index 3ae40bd74..390a76080 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.6-legacy.zip
index 2afac4c33..4a9b02e1e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.0-compact.zip
index cf5e604fa..8c3c5dd75 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.1-compact.zip
index d3512206c..beb7c65cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.10-compact.zip
index e65b41784..9b5599411 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.11-compact.zip
index 81aee0766..5c5ff937a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.12-compact.zip
index 18c69fe63..de0bc5386 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.13-compact.zip
index 69aa742a2..501e8e369 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.14-compact.zip
index 44cbee76c..54c86b3d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.15-compact.zip
index 1424b07d8..c05be254c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.2-compact.zip
index 5ce050c5e..83bf8252f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.3-compact.zip
index 4a095e094..3fd010b08 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.4-compact.zip
index 8d05a44eb..a2fb78727 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.5-compact.zip
index 655dd21e1..2f246889b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.6-compact.zip
index 5b9f3a191..5ad94a1de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.7-compact.zip
index 4f567ac84..b562059ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.8-compact.zip
index e0e8ed249..d78f88055 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.9-compact.zip
index d05eeccce..b8f3ae7ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/comment-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.0-compact.zip
index e51a04a73..9b5a587fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.1-compact.zip
index 35dc0fd72..f3d88cec4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.10-compact.zip
index 6d89f76a3..0becae538 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.11-compact.zip
index b902ba52d..81ac4c008 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.12-compact.zip
index 80e5589a3..375b70d95 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.13-compact.zip
index 735878448..c90d6a3fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.14-compact.zip
index ac00a3c40..e6545343e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.15-compact.zip
index 59c2d7d46..703597bba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.2-compact.zip
index 727906e4a..569fdc6ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.3-compact.zip
index 4403beec1..8aaf2e408 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.4-compact.zip
index 555941eb6..bb2524317 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.5-compact.zip
index 20e1f23d0..fac7a488b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.6-compact.zip
index 5df5f5348..e361e1593 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.7-compact.zip
index 32ecbeb82..eb1742114 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.8-compact.zip
index 1da464acc..d9ff5d172 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.9-compact.zip
index a1f9ff6e4..ff137409b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases/test.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases_issue_1319/test.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases_issue_1319/test.sol-0.5.12-compact.zip
index f1b133056..235e9402c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases_issue_1319/test.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases_issue_1319/test.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases_issue_1319/test.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases_issue_1319/test.sol-0.5.12-legacy.zip
index 3f457a34d..131c7e3e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases_issue_1319/test.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_aliases_issue_1319/test.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_free/Caller.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_free/Caller.sol-0.8.2-compact.zip
index f7aa589ce..26680c8d6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_free/Caller.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/complex_imports/import_free/Caller.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.0-legacy.zip
index a678ec892..9f5fc55d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.1-legacy.zip
index 30f281f34..24f01dcd5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.10-legacy.zip
index 8e0e52b46..54e0c3661 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.11-legacy.zip
index 6927b6e08..ddf6e9ae4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.12-compact.zip
index 54ad75f61..add8b1ef2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.12-legacy.zip
index c35a4fd49..17bd4229b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.13-compact.zip
index cc623fb97..f54b72dac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.13-legacy.zip
index 9a2d39107..6e3288a3a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.14-compact.zip
index 3e2a2301b..9b56f808b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.14-legacy.zip
index c51b3ef00..55950a059 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.15-compact.zip
index 452a01b8f..bf8816acf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.15-legacy.zip
index 19244aa08..e3bb456d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.16-compact.zip
index 386844b4b..549d05e13 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.16-legacy.zip
index d178ba51b..e7f767444 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.17-compact.zip
index f5bf374ec..95753026a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.17-legacy.zip
index 543052940..7164a4e9a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.18-compact.zip
index 28bcf90cf..f4f856799 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.18-legacy.zip
index 7912d32fc..4513a2228 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.19-compact.zip
index 1253f1002..0115851e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.19-legacy.zip
index 7e3a63aad..b5b3e5e2c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.2-legacy.zip
index d145af6a1..2b0b9c9f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.20-compact.zip
index 414b7a057..4e90599fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.20-legacy.zip
index cfb24e4d6..bfe5bf10a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.21-compact.zip
index 57c5268df..698a1f7f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.21-legacy.zip
index 6d635f848..39cac6028 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.22-compact.zip
index cc71299ad..97ff1b941 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.22-legacy.zip
index 0f92a14e7..f01cb6250 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.23-compact.zip
index b07e39086..4756f9a16 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.23-legacy.zip
index f89452620..3275d3704 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.24-compact.zip
index 7589a873b..d221735af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.24-legacy.zip
index bd7e5f8b5..2c90188d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.25-compact.zip
index 150777f83..294102006 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.25-legacy.zip
index b1f308f69..c57402a02 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.26-compact.zip
index c30d8394c..54a228a11 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.26-legacy.zip
index e687a1de9..8b7d0c5e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.3-legacy.zip
index f9caa8cdc..8af6be14f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.4-legacy.zip
index 82661e93a..c0b2620f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.5-legacy.zip
index 5a9d42929..d72d30057 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.6-legacy.zip
index 43873a799..cd746a7e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.7-legacy.zip
index c6874ccc1..cf9f61be8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.8-legacy.zip
index cc7e8bbd5..15ad7393e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.9-legacy.zip
index e2f623805..028aa410c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.0-compact.zip
index 1c842515e..4b1e3cd4a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.0-legacy.zip
index 2ad79d6a4..1db37a5b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.1-compact.zip
index df5f2528c..074b99af8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.1-legacy.zip
index 32dc87f32..ace2f21dc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.10-compact.zip
index d434c5c17..59f11f8ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.10-legacy.zip
index a824d5531..01e4c87d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.11-compact.zip
index c54fbebdb..31da670cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.11-legacy.zip
index a57e035a2..18a488241 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.12-compact.zip
index b195262cd..0f52f3909 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.12-legacy.zip
index 45e9e8330..d27d023b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.13-compact.zip
index f23878a80..1285782fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.13-legacy.zip
index b65cbb515..fb05815a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.14-compact.zip
index 1008c234f..b561e731d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.14-legacy.zip
index d079bb96d..a49d6f2d8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.15-compact.zip
index 9e2d211e6..fc4ace377 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.15-legacy.zip
index 2ed5b09f0..0b8cdcf5f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.16-compact.zip
index 64264e4fd..1998c238b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.16-legacy.zip
index 1cff4963a..ce2c64a52 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.17-compact.zip
index 4d762fd70..cf268ffb7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.17-legacy.zip
index 126b72910..a02f5fff4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.2-compact.zip
index 5f0d3b26e..d7992b130 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.2-legacy.zip
index 59418e1d3..f71c52fc8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.3-compact.zip
index 24c828c4e..17a7017e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.3-legacy.zip
index 84b44c365..3fb4e73c8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.4-compact.zip
index 1f979f2b1..545f0cf3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.4-legacy.zip
index 9859263fc..6835e2e00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.5-compact.zip
index 00d5fcfc4..2a07630c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.5-legacy.zip
index 4ecd82c43..6e1dda2b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.6-compact.zip
index 521186d38..b6147770d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.6-legacy.zip
index 614d04c29..5ba3f3233 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.7-compact.zip
index e71db1deb..81c5adabf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.7-legacy.zip
index bdd7c827e..295a35c52 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.8-compact.zip
index c408d96cf..24bc6d416 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.8-legacy.zip
index 28f07697a..bb77f18b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.9-compact.zip
index e824e571a..957941abf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.9-legacy.zip
index fb45381f9..2977b01ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.0-compact.zip
index fbce67319..cf98b38af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.0-legacy.zip
index 88f428de2..b04466023 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.1-compact.zip
index 229c7759d..181ae42b7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.1-legacy.zip
index f9739ef26..14ab19fb7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.10-compact.zip
index 1d30883eb..627cbb5ea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.10-legacy.zip
index 7e799e7a7..965df52c3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.11-compact.zip
index 346907a21..7209bf894 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.11-legacy.zip
index d4260acad..88601850b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.12-compact.zip
index c0a0ae374..db3afd934 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.12-legacy.zip
index aff2c744d..3935ed998 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.2-compact.zip
index a6b3d8d7e..395e0f397 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.2-legacy.zip
index bff1336c9..ab9856eec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.3-compact.zip
index 1bb3da73c..91cf308d8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.3-legacy.zip
index 70fadcf10..8e12c7335 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.4-compact.zip
index 8652363fd..aa02ec42c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.4-legacy.zip
index c3dcaa88a..9eeac6a80 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.5-compact.zip
index 944bbc5f6..9630e2993 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.5-legacy.zip
index 819fab9f7..ff9a9df86 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.6-compact.zip
index dc83a4ce6..0b3097e13 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.6-legacy.zip
index fa335e72a..07e156165 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.7-compact.zip
index 65899ac4a..d5290b192 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.7-legacy.zip
index 1312a8112..91a2b31e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.8-compact.zip
index 2ca9f5cc5..71a146817 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.8-legacy.zip
index 4a82dbf43..d2e7e822e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.9-compact.zip
index c6cb02858..744b15b6e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.9-legacy.zip
index 919c23cbb..2cf663479 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.0-compact.zip
index 2fa9d21bb..1d69f5b8a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.0-legacy.zip
index efea7b9b5..a29245503 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.1-compact.zip
index 75a2beece..d0d99b374 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.1-legacy.zip
index 1e860012e..2f773936b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.2-compact.zip
index 7eb532339..ece0a8bc9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.2-legacy.zip
index 9947168c7..fe0c13d46 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.3-compact.zip
index 9aa4e5d93..6d848d7da 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.3-legacy.zip
index 9cbaca1ed..d8e9b39bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.4-compact.zip
index dd2a1c552..d52045547 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.4-legacy.zip
index 6f1b1cb34..fe94e9a73 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.5-compact.zip
index bb9fb22f7..6336e80e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.5-legacy.zip
index 7bde06ab6..2d5092d7e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.6-compact.zip
index 70f014fb6..55842ca1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.6-legacy.zip
index d3ffefdf2..dd4bbc6c3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.0-compact.zip
index 6fb6a7488..47adcb2a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.1-compact.zip
index 821eac351..b3403a856 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.10-compact.zip
index 3a1f04db0..637931516 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.11-compact.zip
index 6926b9069..c248ae37e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.12-compact.zip
index 3e1e6cc6e..faa49e5fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.13-compact.zip
index b421fef9f..efcd6bf6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.14-compact.zip
index 53fac4b2b..815508d2d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.15-compact.zip
index e3e2adef6..60bf74716 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.2-compact.zip
index b29cd652d..db4fe1f16 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.3-compact.zip
index 5cef5dff3..5d9c8644a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.4-compact.zip
index e6a7daede..3d02615d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.5-compact.zip
index fa8f81aee..10c6078eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.6-compact.zip
index 024a6b936..d24d46515 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.7-compact.zip
index 6fc92694c..9c1ddfc02 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.8-compact.zip
index 4a31ae8b8..26e387f21 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.9-compact.zip
index 623ff85ec..4aa40d442 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/conditional-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.0-legacy.zip
index 575dade6e..d9a80edc5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.1-legacy.zip
index 413e917e0..bd594351c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.10-legacy.zip
index 0857699d0..1a7325b5f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.11-legacy.zip
index 130cf931d..2d7595533 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.12-compact.zip
index 7fbf94269..cf77e9b35 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.12-legacy.zip
index 26b9aaf3c..beb430171 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.13-compact.zip
index 4205a17bd..ff4c8b2de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.13-legacy.zip
index 66e15690c..6f3cd8e5e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.14-compact.zip
index d5e94a171..b276647fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.14-legacy.zip
index 54a3ec590..e7e459cfc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.15-compact.zip
index 918a70706..486d311bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.15-legacy.zip
index 63c39ee19..21eb28f76 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.16-compact.zip
index 4dd6a311c..fc83c39a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.16-legacy.zip
index 452e25f91..13912a240 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.17-compact.zip
index 42892037e..f98385b4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.17-legacy.zip
index f5318bb37..68e7033ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.18-compact.zip
index 9d697510f..d27b763bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.18-legacy.zip
index 27d3c8265..d30f45c06 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.19-compact.zip
index 8129d80c6..f0eec575c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.19-legacy.zip
index 640a3cfa1..e73e55f5d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.2-legacy.zip
index a7e855d89..e0f7ecb51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.20-compact.zip
index 01340ebf8..a8954904c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.20-legacy.zip
index 60b39a517..8cff88519 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.21-compact.zip
index 977ce0a39..209dd1b4e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.21-legacy.zip
index b253ce853..e31e0a643 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.22-compact.zip
index 731f62468..223676839 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.22-legacy.zip
index c56c021ac..344eda669 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.23-compact.zip
index 9c44a597c..4123f77ed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.23-legacy.zip
index 8cf4d5051..26bf88f9a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.24-compact.zip
index da47c2a58..09f779d8b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.24-legacy.zip
index 741008455..b06653b7b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.25-compact.zip
index ee20a1a03..1959f3769 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.25-legacy.zip
index 9db6f6b08..6363f1b76 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.26-compact.zip
index 0c280339b..a583cff4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.26-legacy.zip
index 42822c7b2..5b187b002 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.3-legacy.zip
index ef98412f5..d732bc657 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.4-legacy.zip
index ba64f13ee..204cc711a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.5-legacy.zip
index 648a78180..f2a064bf4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.6-legacy.zip
index ff846a299..a82fe0829 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.7-legacy.zip
index 81a085a12..773454d54 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.8-legacy.zip
index c1ec2e50d..416a39bef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.9-legacy.zip
index 61b1dc5eb..c18f97bd9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.0-compact.zip
index 9ba470b46..49c39afa9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.0-legacy.zip
index 1df4accf8..cfa7b50cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.1-compact.zip
index cd03c6ae5..0c49ce2fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.1-legacy.zip
index 3095c6328..284bd1a08 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.10-compact.zip
index dc5de1be6..71bf4e531 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.10-legacy.zip
index 4ea3cffaa..96039d631 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.11-compact.zip
index e0468646d..ec1a937dc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.11-legacy.zip
index b27ba19ce..38bef9aaa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.12-compact.zip
index 7713ba108..7372c7430 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.12-legacy.zip
index 51c040800..ed789e38e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.13-compact.zip
index 6fb2b7688..a22c7ba6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.13-legacy.zip
index 4c34381e8..70aee9f86 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.14-compact.zip
index 3be26c397..c91ba5eee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.14-legacy.zip
index 20b7f8ce4..4bde8ba59 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.15-compact.zip
index c22fdd444..757556331 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.15-legacy.zip
index c707e9603..73e0b016c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.16-compact.zip
index ba3151eea..dd4cec69f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.16-legacy.zip
index f383696b9..fc768ab10 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.17-compact.zip
index 52a0a6bd0..dd8243405 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.17-legacy.zip
index 51f1a2247..f866f2711 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.2-compact.zip
index 700587c21..ef82803fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.2-legacy.zip
index cf02b57a9..b6a5e1dd1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.3-compact.zip
index 00538313e..62b3f298b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.3-legacy.zip
index c10e72bf0..644c7f5f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.4-compact.zip
index bdcdf69b7..27d2385a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.4-legacy.zip
index 481ac1e03..f8fa4cdd4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.5-compact.zip
index 9639b3af7..c162a10e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.5-legacy.zip
index b47d146a5..568c6d114 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.6-compact.zip
index fbcfbaa87..6cc8def1e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.6-legacy.zip
index 7d978c17f..4ad4e5808 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.7-compact.zip
index 7daa7f2fb..77bb3c709 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.7-legacy.zip
index 56461399a..da1d5493f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.8-compact.zip
index 7869168eb..c728ed389 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.8-legacy.zip
index 329ea859d..401350c5e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.9-compact.zip
index 27ef6d1cd..ab07395a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.9-legacy.zip
index 7de29b473..bdc8a8a6b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.0-compact.zip
index fa94da801..e52cef2b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.0-legacy.zip
index 0cee22dd8..fcefd08c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.1-compact.zip
index 2a4c60598..1bf1756c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.1-legacy.zip
index 194af30f3..bb609bb03 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.10-compact.zip
index 7ba1198fa..d68563ea3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.10-legacy.zip
index c8f2915e4..dee1cc983 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.11-compact.zip
index ac675de9a..7d91863fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.11-legacy.zip
index 0ea7fc182..ed5126fd8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.12-compact.zip
index aa1c5ef8f..3fe7d754d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.12-legacy.zip
index 9d3cb9f49..78984dec4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.2-compact.zip
index 0aaa63ffa..b6a572420 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.2-legacy.zip
index da4ba79bb..d927b1713 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.3-compact.zip
index f9692f12b..d42be8450 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.3-legacy.zip
index b777fc927..b5091c9ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.4-compact.zip
index 0dd71210d..82a77809b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.4-legacy.zip
index 6437279a0..908191bb7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.5-compact.zip
index bee18b578..dea381ff2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.5-legacy.zip
index 4b6895c5e..1e09d2626 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.6-compact.zip
index 83e5f2a13..063ec99f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.6-legacy.zip
index 9e1ec5651..651274918 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.7-compact.zip
index 66dbc2dd6..dbccbd549 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.7-legacy.zip
index 5bf9c9d7d..aa5266350 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.8-compact.zip
index 054d0c959..c02302af2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.8-legacy.zip
index 2cf52ab9a..5deb7e27b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.9-compact.zip
index 2b1c635b5..c96eae325 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.9-legacy.zip
index b7cd134aa..9b9ff9d60 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.0-compact.zip
index 24889e968..79fbaaede 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.0-legacy.zip
index 751dbb8d9..e111a431e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.1-compact.zip
index e6ab9fe2d..40305aab2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.1-legacy.zip
index 3dc4a88f4..dbed51962 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.2-compact.zip
index 0472bfd21..6c2e13a34 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.2-legacy.zip
index 390134dae..aa4c482fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.3-compact.zip
index 38c00e787..8d080e811 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.3-legacy.zip
index 361f76c18..d61c092c8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.4-compact.zip
index 155924127..327a7f819 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.4-legacy.zip
index 64348d1e5..ebead3636 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.5-compact.zip
index f90a40287..9f50a1ca6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.5-legacy.zip
index 4b58b91b8..257fb3f83 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.6-compact.zip
index 69294009c..809ba91b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.6-legacy.zip
index d9188ce8b..4cf72a93f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.0-compact.zip
index 9a0657bae..207ecae9d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.1-compact.zip
index fbb68f626..7ebc9dd0f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.10-compact.zip
index 09a65337f..90a2f6b4f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.11-compact.zip
index b96db1b5f..964601111 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.12-compact.zip
index 82ce405e2..5310f78e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.13-compact.zip
index c34c7794e..ba92c0086 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.14-compact.zip
index fe086dd31..506aad0bc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.15-compact.zip
index 03b7d5b7d..9201d33aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.2-compact.zip
index 53d13c548..c363f290b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.3-compact.zip
index 176aeab02..ef8a53d88 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.4-compact.zip
index 38dbd232e..a6b28e793 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.5-compact.zip
index 6af6296f7..6b4d0b6e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.6-compact.zip
index 69bdc2022..17d20ddb9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.7-compact.zip
index 7c4ab647a..e22b35981 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.8-compact.zip
index 0188da493..852698a3a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.9-compact.zip
index ae2fec867..ceeddd20b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/continue-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.0-legacy.zip
index f64877654..dadced1e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.1-legacy.zip
index 3459efaf5..d88dfcccf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.10-legacy.zip
index 45b6b2ce1..40daea59b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.11-legacy.zip
index 2a613b0ef..74250696e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.12-compact.zip
index be4436447..2686e3eea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.12-legacy.zip
index 53e751f43..000485375 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.13-compact.zip
index 84e249004..262ce1bd7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.13-legacy.zip
index eca3142d3..94f040486 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.14-compact.zip
index 31f5e7bb0..0e45e64ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.14-legacy.zip
index adcd2f02b..60116a23a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.15-compact.zip
index 9ea685e5f..9c827ad2d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.15-legacy.zip
index b4b78bdcf..b0e972a90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.16-compact.zip
index 347c2d6b1..fd862afd1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.16-legacy.zip
index b5ab18cb0..69c12f7dc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.17-compact.zip
index e65959357..3a9ed5f17 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.17-legacy.zip
index 8762373e1..7bcd20400 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.18-compact.zip
index 24c8b3b81..446d3565a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.18-legacy.zip
index cde2b6b8b..cdb1cf7f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.19-compact.zip
index 6e391610a..4162987e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.19-legacy.zip
index d46444261..c13c1a50f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.2-legacy.zip
index 9f36cc88a..e88a25251 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.20-compact.zip
index e551b0719..ecf77bd3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.20-legacy.zip
index f82e98150..e93c4797d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.21-compact.zip
index b705ca462..0113fad4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.21-legacy.zip
index 71fc0bea4..3409b01b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.3-legacy.zip
index d8a3fd6e9..170a22b20 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.4-legacy.zip
index 47863ee76..f305c7cfe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.5-legacy.zip
index 478760f26..482b7a612 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.6-legacy.zip
index 77e2cb1a6..7ab3202c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.7-legacy.zip
index b90454312..a67b2acd5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.8-legacy.zip
index e9b9fcb29..b4a3b4b79 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.9-legacy.zip
index cd485e3e6..a3f13db71 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.22-compact.zip
index 8cdf72e5d..b9106e29b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.22-legacy.zip
index 6874a9ef1..b2e7ae1cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.23-compact.zip
index 64203f893..7b4f204e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.23-legacy.zip
index a4e40b829..9a68fa9f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.24-compact.zip
index 885d2a4b8..a16de891a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.24-legacy.zip
index 44ab88594..bda428e13 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.25-compact.zip
index ab8f9045a..28c8e5cce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.25-legacy.zip
index 1cb11a01b..1b7a6b233 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.26-compact.zip
index af8dbeff5..9ef10786e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.26-legacy.zip
index 9f99d71de..d123bc573 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.0-compact.zip
index 63c4daa52..e8befed73 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.0-legacy.zip
index 669d73c91..82ee7263a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.1-compact.zip
index 3acf8f915..d7bda27be 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.1-legacy.zip
index 643566539..d3abdde28 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.10-compact.zip
index 2062f8830..a1ddd3ca1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.10-legacy.zip
index 6b010e0a1..36d1ea528 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.11-compact.zip
index 11aeb910c..da0ab557a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.11-legacy.zip
index 9888a4070..5e45fa0ea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.12-compact.zip
index 8468a0908..d84dc1739 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.12-legacy.zip
index 323e5eb1c..e716a76b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.13-compact.zip
index 19c1132cd..7de95ba19 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.13-legacy.zip
index b4ebd8c37..f6cdc6078 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.14-compact.zip
index cf23fde3e..f929f953e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.14-legacy.zip
index ea8e6c4b3..3b90b2790 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.15-compact.zip
index 8d28a04b2..740cbbd79 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.15-legacy.zip
index 600d21747..ef8b62bea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.16-compact.zip
index 9784f831f..15a8bc4db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.16-legacy.zip
index 4b980fb4b..73faa5de0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.17-compact.zip
index d405ba862..4cb835433 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.17-legacy.zip
index 948049573..ab7d5f9ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.2-compact.zip
index 517d64b38..fb1a82e4e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.2-legacy.zip
index 07570fbd9..850fc0b62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.3-compact.zip
index a0e840afb..fe9f6831d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.3-legacy.zip
index ffcabf3b6..e7a973a74 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.4-compact.zip
index 2bbca23ef..1175f7930 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.4-legacy.zip
index 66a750885..7cbdffc77 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.5-compact.zip
index 63d2a6e9b..8bb56b667 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.5-legacy.zip
index 34e860c62..1a0cc7e03 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.6-compact.zip
index 12447c9be..c322bcfa6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.6-legacy.zip
index d68806d4d..beccd5fe5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.7-compact.zip
index 6618c9241..1ea2d6ec2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.7-legacy.zip
index 86f0fe714..aeada1a2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.8-compact.zip
index 230105c39..02bf18c10 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.8-legacy.zip
index 6e88eecd0..a5c73ce4e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.9-compact.zip
index 615a0d3cf..c2756b203 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.9-legacy.zip
index 752a02ad2..f6b7a0fa7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.4.22.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.0-compact.zip
index a553105e7..2018e26df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.0-legacy.zip
index 5e23d545b..d41ed71b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.1-compact.zip
index 7b2364850..dccdecd9f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.1-legacy.zip
index ed2ca56ce..249e6c0e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.10-compact.zip
index 375f90a99..494f7f9cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.10-legacy.zip
index 296ec1d90..7acef20f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.11-compact.zip
index 6f1e16a92..dfe667816 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.11-legacy.zip
index d43808d4e..e408652f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.12-compact.zip
index 4634226c3..616e4e7a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.12-legacy.zip
index 8bb939ce6..3c3d89a62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.2-compact.zip
index 843cf4d15..783690bd1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.2-legacy.zip
index a3d946889..be6412e8a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.3-compact.zip
index 86b7f8640..97ee4e4a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.3-legacy.zip
index c95034c3a..9b121dbde 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.4-compact.zip
index 7456def1c..c3fef1a93 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.4-legacy.zip
index 657530c2b..e2fe64109 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.5-compact.zip
index c5a9dcab8..ebe851033 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.5-legacy.zip
index 2cd477bad..5826cf0d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.6-compact.zip
index b03a062e7..d0310b756 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.6-legacy.zip
index 554d7bb3f..a272aa577 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.7-compact.zip
index d0e5c4f57..d44f95ef1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.7-legacy.zip
index e8acc29b7..91416d6cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.8-compact.zip
index 6bec5d079..8804c62e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.8-legacy.zip
index aa0f82d95..25d2d01bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.9-compact.zip
index 60af06452..3b32a87c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.9-legacy.zip
index d3209de4a..a3f178e83 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.0-compact.zip
index 3675e081e..244233f1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.0-legacy.zip
index 6e21c3601..a37fed96e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.1-compact.zip
index 313d3ba1b..7823f9aed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.1-legacy.zip
index edd6965bb..11e63afca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.2-compact.zip
index 1e9019e26..5d936918f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.2-legacy.zip
index 855c5de10..d48d5444d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.3-compact.zip
index b2f14c97e..49d24f6fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.3-legacy.zip
index 2ba456f02..711e2d82e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.4-compact.zip
index ef0ce87e9..f2eb02d98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.4-legacy.zip
index 5f1bfa234..b37862fdd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.5-compact.zip
index 3d867c63d..10d1458f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.5-legacy.zip
index b1fa8c4b7..031c7a4f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.6-compact.zip
index a1abd94ff..ac7f6867c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.6-legacy.zip
index 99c208e23..9cc012c2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.0-compact.zip
index 2527fb5dc..dec98485f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.1-compact.zip
index c08a84145..c6cbf4a98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.10-compact.zip
index 071ea5213..a0892233f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.11-compact.zip
index 81236e218..bce04e3ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.12-compact.zip
index 7c2481465..b034e5cf5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.13-compact.zip
index b3397b955..cfabd5787 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.14-compact.zip
index 9f1f52b6d..f39fef0ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.15-compact.zip
index 5fc388cc6..ee262097a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.2-compact.zip
index 8f80f193f..370b2c162 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.3-compact.zip
index efc7018e2..256fd495c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.4-compact.zip
index 6e928a60a..a74a6c1d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.5-compact.zip
index 315ed826e..b7dd11958 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.6-compact.zip
index adfe490aa..961077ff8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.7-compact.zip
index e677eb3dd..11f5fb88e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.8-compact.zip
index 8d1188726..866cbdb8e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.9-compact.zip
index a6cd72d29..9ab71149c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/contract-0.6.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.10-compact.zip
index 0d7f3ac0f..1b023213c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.11-compact.zip
index 193a3c931..e874d4ec7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.12-compact.zip
index 02d8a6c37..cc3ffec9d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.13-compact.zip
index 6225bd2c2..207c14c43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.14-compact.zip
index 6c13dbacc..bf796419f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.15-compact.zip
index fb3120b43..5582fe086 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.4-compact.zip
index 79aa6ddf6..80355c6e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.5-compact.zip
index 3c91ae99a..356ba7cfc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.6-compact.zip
index 0c0de9fb8..381a72df6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.7-compact.zip
index 7a3ef5b72..52b00c45a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.8-compact.zip
index 0f1e60672..a09da6441 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.9-compact.zip
index eae6bf9c1..eb20c21d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom-error-selector.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.0-legacy.zip
index a126eff99..28d58d605 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.1-legacy.zip
index d205c47e1..c98e4a23d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.10-legacy.zip
index 2b1e83605..8c8518135 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.11-legacy.zip
index 5381114e3..af3c1a1ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.12-compact.zip
index 20ced30c5..03ff0810c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.12-legacy.zip
index a2d7bfd84..341c612ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.13-compact.zip
index 8cec47c3f..70547537d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.13-legacy.zip
index a4ebfab94..7fa85c54c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.14-compact.zip
index a8d1c8e30..04fc75a3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.14-legacy.zip
index ad7391ddb..6f01e1583 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.15-compact.zip
index 1f44ecd59..8d3be45b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.15-legacy.zip
index 0232172ac..f16dd3c3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.16-compact.zip
index 27ab0a442..7aec7eecd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.16-legacy.zip
index f2494f029..a815f409d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.17-compact.zip
index a69670df1..bf33fe481 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.17-legacy.zip
index 790a2cca2..0749c662e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.18-compact.zip
index ba56fe3e3..37f499996 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.18-legacy.zip
index ac4794959..aa98aa0f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.19-compact.zip
index b6886e5b8..2e42d577e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.19-legacy.zip
index 93e88f3bd..d6a3e4478 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.2-legacy.zip
index 29abdce60..2ce00a92a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.20-compact.zip
index c5232b7c5..3d9d022d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.20-legacy.zip
index e265f875e..81cf7213e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.21-compact.zip
index f290928ed..6517d17b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.21-legacy.zip
index 16b3f854f..ff3eb3720 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.22-compact.zip
index 2f96ffade..9d9d1cb22 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.22-legacy.zip
index 62780f1e6..e67990997 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.23-compact.zip
index a5dd80cce..c802aa3cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.23-legacy.zip
index 0ef64b9ce..b2106665d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.24-compact.zip
index fe5c3f38b..5a02b3f79 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.24-legacy.zip
index a3b0244b6..efb16961f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.25-compact.zip
index f7e573843..729047be4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.25-legacy.zip
index a88800eb3..b999a5e45 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.26-compact.zip
index ddd95dac4..6ef5a7c99 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.26-legacy.zip
index 50c88ff8a..3ad3fcd28 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.3-legacy.zip
index e9f3ae64f..1deda76a1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.4-legacy.zip
index a996fac15..93a3f9a1e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.5-legacy.zip
index 4226876c2..76f2dfb04 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.6-legacy.zip
index 0eeea5e4b..3d4ec16d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.7-legacy.zip
index 2b5b716cb..2f05eead7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.8-legacy.zip
index 38bd0314c..dfa4d25b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.9-legacy.zip
index 5c43d16de..b2dbf7fc1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.0-compact.zip
index 828b12785..b01ccbbb2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.0-legacy.zip
index 2c5336657..87cb81d6c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.1-compact.zip
index 75866a853..646a7ecfb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.1-legacy.zip
index 10ed05caa..2a625965d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.10-compact.zip
index 7ae30ead5..b4a1b2234 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.10-legacy.zip
index 26a3f24c9..3dcc4d607 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.11-compact.zip
index 4bb227368..c000d12f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.11-legacy.zip
index 7ac965280..2918ca4b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.12-compact.zip
index d25f11c19..e98239eba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.12-legacy.zip
index e57fcfb0d..e7ed78a2c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.13-compact.zip
index 7684af134..4b83be1b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.13-legacy.zip
index db72ed5b9..f8aee608c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.14-compact.zip
index 38e1fcefe..46dd05f7f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.14-legacy.zip
index 692329dde..cec9d8431 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.15-compact.zip
index 0064b8db2..697037114 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.15-legacy.zip
index 60253a370..5893bc504 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.16-compact.zip
index 1a9864548..1c561d662 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.16-legacy.zip
index 967594dba..2d512b5e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.17-compact.zip
index 7b49de3a4..093b51d8b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.17-legacy.zip
index b1153bad5..2bda8e3ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.2-compact.zip
index ad7bc862e..ff55ee784 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.2-legacy.zip
index 7a08472d1..841e39dd1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.3-compact.zip
index 3904b2ca7..9a9590827 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.3-legacy.zip
index e26195cea..e3cf537ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.4-compact.zip
index 8fa9ea68e..794bb52eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.4-legacy.zip
index 7e98fd2b1..dc563cd9b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.5-compact.zip
index e50ec7ceb..deb2eec4f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.5-legacy.zip
index 0137f518e..ec7c026a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.6-compact.zip
index d0c071cf8..eaedf43ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.6-legacy.zip
index 48c30674a..8d5e58d5b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.7-compact.zip
index bec2c53ca..e88d4cdf2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.7-legacy.zip
index 062921e92..c1f995585 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.8-compact.zip
index 089989426..8fa44f629 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.8-legacy.zip
index 0a0d2a1fb..ca4679bc5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.9-compact.zip
index e906c3ed4..69099b80e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.9-legacy.zip
index d6634efa4..10dd5d6f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.0-compact.zip
index 84cce8f46..c676c23b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.0-legacy.zip
index 8f0253788..88dd4da66 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.1-compact.zip
index df11b52a4..a85656284 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.1-legacy.zip
index f75e0d482..4e1eaae51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.10-compact.zip
index 7c721b56a..d87cd80c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.10-legacy.zip
index a2b977454..81b4fbfa1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.11-compact.zip
index 47082bc26..5112d6a53 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.11-legacy.zip
index c0bb285ba..0a9abd593 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.12-compact.zip
index a01941a39..16e1d68c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.12-legacy.zip
index b4a812040..f69f5f969 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.2-compact.zip
index 04caed162..5372c7cd7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.2-legacy.zip
index f85598e2e..c81c473a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.3-compact.zip
index 367b53e57..cd6cdf7a1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.3-legacy.zip
index abce6c96c..0dde21f93 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.4-compact.zip
index e4aee435b..63204135a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.4-legacy.zip
index 94edf34ad..95343b430 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.5-compact.zip
index 9c8ee8d1c..78e52d4d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.5-legacy.zip
index b86193e24..357c677f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.6-compact.zip
index 22bcb2a61..d1c38c5d8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.6-legacy.zip
index ebc9b82a5..162ff76f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.7-compact.zip
index dbb33a8e8..41aa328a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.7-legacy.zip
index 2726eb557..36339d9ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.8-compact.zip
index 12dc89c6f..47c11840f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.8-legacy.zip
index 2d3026253..908f242fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.9-compact.zip
index 17e68670e..16e624b64 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.9-legacy.zip
index 187ee490e..dd3055825 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.0-compact.zip
index 12f248dc6..587d0b074 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.0-legacy.zip
index c0f02c253..24146a246 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.1-compact.zip
index 1cbf83242..11bf6df8c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.1-legacy.zip
index 9066246de..807fd4f65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.2-compact.zip
index 96b4a25e3..5902a80f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.2-legacy.zip
index 2b6c687c1..16dda746b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.3-compact.zip
index b428ced20..fefe989d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.3-legacy.zip
index 6ffd16102..803c081d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.4-compact.zip
index 86961172d..fbcdb67b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.4-legacy.zip
index 360705b8c..996e2215d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.5-compact.zip
index 38d880829..628398dd6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.5-legacy.zip
index cff5dbdd0..689305b7c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.6-compact.zip
index 8d0ecec72..cd269c3ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.6-legacy.zip
index c9c92acae..92e44ea7c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.0-compact.zip
index 405929fc5..68f083d62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.1-compact.zip
index 6dfe28148..8294d2934 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.10-compact.zip
index 0ef529421..97688504a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.11-compact.zip
index c25292a57..320799edd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.12-compact.zip
index 0cc9a4ed1..8ef446a6d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.13-compact.zip
index 5f5fdd9ea..7e4cd8a20 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.14-compact.zip
index 15f1623cc..be3915400 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.15-compact.zip
index a08315095..eaa9d9577 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.2-compact.zip
index 42aaa14b2..edcc488fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.3-compact.zip
index 164efa6b8..6dc06bfca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.4-compact.zip
index 114a3755f..895a5fb82 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.5-compact.zip
index ce452fc4c..a8a006cf9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.6-compact.zip
index 873138e94..4d5f060d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.7-compact.zip
index 9079fbc30..6848d5eee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.8-compact.zip
index 4bb601b01..e92a84f32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.9-compact.zip
index ff2a64303..e08419bbe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.4.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.10-compact.zip
index fc45cb40e..c5c3245e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.11-compact.zip
index 853879cf5..088976853 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.12-compact.zip
index c72629231..79cb37630 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.13-compact.zip
index 9ada2c335..fd13eb0b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.14-compact.zip
index e36f5b94e..7083dbd7e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.15-compact.zip
index 1023ab1d4..0a2bffbd0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.4-compact.zip
index 5ecf2b037..b996f59dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.5-compact.zip
index 357554c09..0e89bc257 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.6-compact.zip
index c5f05ef20..4fe7c8785 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.7-compact.zip
index 51828bce7..6e9bba4a1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.8-compact.zip
index eb6ba091b..d002dec7f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.9-compact.zip
index 17e752018..0b19a92f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error-0.8.4.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.10-compact.zip
index e73171e2c..5aa348462 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.11-compact.zip
index a125cbf64..8f5f18832 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.12-compact.zip
index 0980aa872..0fb8b7690 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.4-compact.zip
index ced46fe30..14497220e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.5-compact.zip
index 1c1f762dc..d5b3272ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.6-compact.zip
index f01a2afb9..39df4b9b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.7-compact.zip
index 8584364ee..8d39d9069 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.8-compact.zip
index f2792f8c6..690c254d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.9-compact.zip
index 3bb519f00..afefbdda0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/custom_error_with_state_variable.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.0-legacy.zip
index 5534fb1c4..89d16f856 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.1-legacy.zip
index 4accb39a8..71d05f87e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.10-legacy.zip
index 7d9fadfa4..2ca9a7f45 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.11-legacy.zip
index b3f271b1c..ec13fa4d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.12-compact.zip
index c78f73da9..c61075be9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.12-legacy.zip
index 8c39b8636..38aacf6a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.13-compact.zip
index 6e3efab80..933c79fc1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.13-legacy.zip
index 2eec8c9e0..8f90edf8b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.14-compact.zip
index a8275bd85..1a285fc87 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.14-legacy.zip
index 6e0d38341..8f9b374d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.15-compact.zip
index 5b983a318..d1ae3429c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.15-legacy.zip
index a6b7cc5fc..8197ca8ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.16-compact.zip
index ec3f90df2..6e1e3c9f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.16-legacy.zip
index 2ec0a1618..fcc9b2003 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.17-compact.zip
index 38b669f99..911d1d368 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.17-legacy.zip
index 1bfa746cc..24d754f41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.18-compact.zip
index cd5fb0e0f..3629bfefc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.18-legacy.zip
index e5805cfbc..7e677cbf0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.19-compact.zip
index d231c0617..51177a97f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.19-legacy.zip
index ed02f2064..e2a3ff69a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.2-legacy.zip
index 442e4da18..d620c313c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.20-compact.zip
index 670ae2352..f4b537cb9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.20-legacy.zip
index 8ad88b05c..cfc6a596d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.21-compact.zip
index effcba657..04528dbe5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.21-legacy.zip
index 8c15b2614..745cb2781 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.22-compact.zip
index c5891fa70..1887efcd8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.22-legacy.zip
index 564b20a1c..486db4ef1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.23-compact.zip
index 0c1e280b1..b355fa6e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.23-legacy.zip
index dff5d9074..bda5bb9ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.24-compact.zip
index ae32c5ac0..dd4277100 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.24-legacy.zip
index 17b7a1399..6d9568a88 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.25-compact.zip
index 4deef133a..6a6c3edf3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.25-legacy.zip
index dde3a3960..c8cbbdbf6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.26-compact.zip
index dfe663fa7..53fbd1a87 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.26-legacy.zip
index 9385e4924..1412adf4b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.3-legacy.zip
index c284911af..8c533277b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.4-legacy.zip
index aae3037b7..a41129da4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.5-legacy.zip
index e56828277..71af1d26a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.6-legacy.zip
index 8c325a75e..154a3c7bc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.7-legacy.zip
index 8f4dc81f3..9c59a9e4e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.8-legacy.zip
index 55b7e2f09..521e11351 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.9-legacy.zip
index b64c67aaa..4f0baabb7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.5-legacy.zip
index b212735e8..e5c9cd961 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.6-legacy.zip
index 062714783..b15cb03ed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.7-legacy.zip
index c9bdf2564..5cfc1d598 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.8-legacy.zip
index 419a3a86a..42aa1ed05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.9-legacy.zip
index 8b45ae314..a6c47ee9e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.0-compact.zip
index 2d61c372e..57256773d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.0-legacy.zip
index 5e1d781cc..781b5fc4f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.1-compact.zip
index 13d552799..7498c69a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.1-legacy.zip
index fd30853ef..7124acfb4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.10-compact.zip
index c1ca94910..ee2b1ae70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.10-legacy.zip
index e0e00f3ea..0e5c1eafe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.11-compact.zip
index e7552eefe..03f31d839 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.11-legacy.zip
index ec42f9b81..c577295b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.12-compact.zip
index fc21359a7..5ae3848ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.12-legacy.zip
index 0069ff56b..fa9af222e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.13-compact.zip
index d61377529..f8aa3df48 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.13-legacy.zip
index b5c9ac27e..744cceb4e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.14-compact.zip
index bb915c015..7195a9cd7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.14-legacy.zip
index 1b0e5e2b2..1e1c5ae0d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.15-compact.zip
index 9e0737736..ebc7eb2cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.15-legacy.zip
index 077c39e99..1fc9d1a18 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.16-compact.zip
index 177778616..35735f450 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.16-legacy.zip
index 801b3f82f..c7952ce81 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.17-compact.zip
index 8f5688afb..998425dfd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.17-legacy.zip
index 88b2b9ac9..93395b596 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.2-compact.zip
index 3d5ff3d8a..1bc13ba0f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.2-legacy.zip
index f6e400077..6f936db93 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.3-compact.zip
index 9b45139e1..c65a1a768 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.3-legacy.zip
index 2b72718e4..7c4688c0c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.4-compact.zip
index bf6e21594..0404267ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.4-legacy.zip
index 14ef13c75..79111be11 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.5-compact.zip
index 0452d8709..ede13725c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.5-legacy.zip
index a092daf3e..a47e9724a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.6-compact.zip
index dc3096b4a..6514a10e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.6-legacy.zip
index 7b5fb6a2f..f86a5c528 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.7-compact.zip
index 3fb304dca..168289593 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.7-legacy.zip
index c3ea2b1fe..ca73c4e32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.8-compact.zip
index 75d308f7f..570341fa3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.8-legacy.zip
index 373f109e9..c1c89b3eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.9-compact.zip
index 50a37690f..f1b91b2a0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.9-legacy.zip
index 24a9f2784..344804edd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.0-compact.zip
index 9a8296251..5f681b366 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.0-legacy.zip
index 77def3c61..47072213b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.1-compact.zip
index 7ab980777..a5f23d90f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.1-legacy.zip
index 1a17f87a7..13819dfc2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.10-compact.zip
index 4b4a19028..0c90e0f96 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.10-legacy.zip
index 1930620d4..91e82de63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.11-compact.zip
index 48f568b7d..c55c2fbb5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.11-legacy.zip
index 0358ee65e..f66186151 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.12-compact.zip
index 397408e2a..cab27cfd1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.12-legacy.zip
index aecbc111e..af57d80a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.2-compact.zip
index 45a4784f8..5b8379273 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.2-legacy.zip
index 7d19f265d..910ebe025 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.3-compact.zip
index 1bb2130fa..bf7877a18 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.3-legacy.zip
index 1fe24e831..c087b0204 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.4-compact.zip
index fe9f76262..5a9b08530 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.4-legacy.zip
index e530ce28b..4f5a10e84 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.5-compact.zip
index 7c4cc5dce..ed7ff7cd0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.5-legacy.zip
index c690832c1..df9ca1d21 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.6-compact.zip
index d9ab084e6..f1347c426 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.6-legacy.zip
index 21c4d1f66..26231f964 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.7-compact.zip
index 6d88ac602..3fb741652 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.7-legacy.zip
index 543049019..1d424e487 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.8-compact.zip
index 6b8429159..28868d7ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.8-legacy.zip
index 47d0fa065..d949958a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.9-compact.zip
index 33cd85644..3a6296033 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.9-legacy.zip
index 198bcc7d3..eee0eb396 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.0-compact.zip
index fbcb5fcf7..b671f94e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.0-legacy.zip
index 7dc061d5a..895b5976c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.1-compact.zip
index f6d837072..58b49fe84 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.1-legacy.zip
index 722dee69d..4e648facd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.2-compact.zip
index e4d7ad771..f985b98ad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.2-legacy.zip
index de486b933..602d49aea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.3-compact.zip
index b7eecc085..f7c16c88f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.3-legacy.zip
index 9b3bc0f49..92621154c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.4-compact.zip
index f0637180b..4d3acef70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.4-legacy.zip
index b5477498b..7fd9c0e81 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.5-compact.zip
index fe8a7c812..45303666c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.5-legacy.zip
index 477c91952..3bef58c80 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.6-compact.zip
index d6f08227a..4dded669e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.6-legacy.zip
index cf1ae8b12..13b9f3109 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.0-compact.zip
index c79ba1b86..df6780493 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.1-compact.zip
index 1c0bb4ebf..04c925ffd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.10-compact.zip
index 26603e9b5..b07fcd3b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.11-compact.zip
index fd6cabde6..0cae8b074 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.12-compact.zip
index 540bb92e1..df37ef81a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.13-compact.zip
index 8d6cd4f91..5f3ad1b27 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.14-compact.zip
index 273da3edb..41868bff5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.15-compact.zip
index 5a34a9fa0..29835ddea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.2-compact.zip
index 2b5b461c6..8d6a2af0a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.3-compact.zip
index c4699df16..6436ad958 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.4-compact.zip
index 3263ac3aa..9d0e9fd97 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.5-compact.zip
index 929c58c6e..7f1fbd5d9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.6-compact.zip
index fde951112..b28c7ca5f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.7-compact.zip
index 1a0eb5921..9f0945e43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.8-compact.zip
index 600a52c75..6ec1c0573 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.9-compact.zip
index bc6032e05..deb6e635f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/dowhile-0.4.5.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.21-compact.zip
deleted file mode 100644
index bf5b349c4..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.21-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.21-legacy.zip
deleted file mode 100644
index cc5d6d804..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.21-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.22-compact.zip
deleted file mode 100644
index 388eb09ec..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.22-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.22-legacy.zip
deleted file mode 100644
index 77706c76d..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.22-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.23-compact.zip
deleted file mode 100644
index ce329890f..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.23-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.23-legacy.zip
deleted file mode 100644
index 9cb1b1ce6..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.23-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.24-compact.zip
deleted file mode 100644
index 55bada2dc..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.24-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.24-legacy.zip
deleted file mode 100644
index 5e9ddc19a..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.24-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.25-compact.zip
deleted file mode 100644
index fc237a109..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.25-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.25-legacy.zip
deleted file mode 100644
index 86f64db87..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.25-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.26-compact.zip
deleted file mode 100644
index 31642ff32..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.26-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.26-legacy.zip
deleted file mode 100644
index b55cc26ab..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.21.sol-0.4.26-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.10-compact.zip
deleted file mode 100644
index 91c126f9d..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.10-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.10-legacy.zip
deleted file mode 100644
index 91c126f9d..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.10-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.11-compact.zip
deleted file mode 100644
index 430a59779..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.11-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.11-legacy.zip
deleted file mode 100644
index 430a59779..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.11-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.12-compact.zip
deleted file mode 100644
index f3680ba81..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.12-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.12-legacy.zip
deleted file mode 100644
index f3680ba81..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.12-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.13-compact.zip
deleted file mode 100644
index f89e7ba7b..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.13-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.13-legacy.zip
deleted file mode 100644
index 8d7d1f773..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.13-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.14-compact.zip
deleted file mode 100644
index c8ff21a0a..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.14-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.14-legacy.zip
deleted file mode 100644
index 2d65e2411..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.14-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.15-compact.zip
deleted file mode 100644
index b8c82a9f6..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.15-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.15-legacy.zip
deleted file mode 100644
index 862852bc2..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.15-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.16-compact.zip
deleted file mode 100644
index 489020e4d..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.16-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.16-legacy.zip
deleted file mode 100644
index b8cf5f556..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.16-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.17-compact.zip
deleted file mode 100644
index a5926c631..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.17-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.17-legacy.zip
deleted file mode 100644
index 759b3005c..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.17-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.18-compact.zip
deleted file mode 100644
index 6bd2d86b5..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.18-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.18-legacy.zip
deleted file mode 100644
index e05a7dd9d..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.18-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.19-compact.zip
deleted file mode 100644
index 69cbd36c9..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.19-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.19-legacy.zip
deleted file mode 100644
index 794b8aac9..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.19-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.20-compact.zip
deleted file mode 100644
index 507698d50..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.20-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.20-legacy.zip
deleted file mode 100644
index 29599b159..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.20-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.8-compact.zip
deleted file mode 100644
index 68cb535df..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.8-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.8-legacy.zip
deleted file mode 100644
index ffa1b83a9..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.8-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.9-compact.zip
deleted file mode 100644
index 77bb4c890..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.9-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.9-legacy.zip
deleted file mode 100644
index 77bb4c890..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.4.8.sol-0.4.9-legacy.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.0-compact.zip
index ae561c593..bff01460c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.0-legacy.zip
index e6755abfb..2e66cbf43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.1-compact.zip
index 66217f915..f36bb218c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.1-legacy.zip
index 6177d404c..7bfda3ad8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.10-compact.zip
index 3ac107688..0823b8833 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.10-legacy.zip
index 5b3d045fa..885317307 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.11-compact.zip
index 422851b7c..51c6a4c1c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.11-legacy.zip
index 3698c9f19..7167ccca0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.12-compact.zip
index ee89ed367..6c5262424 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.12-legacy.zip
index ba4faaf11..0499f11a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.13-compact.zip
index 125b3c15c..c5b5e0785 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.13-legacy.zip
index e541db6ce..aaa247c11 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.14-compact.zip
index 33268b8f9..195c8fb6d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.14-legacy.zip
index bfa0b96e4..5e4909d49 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.15-compact.zip
index acf58a98d..decc64f21 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.15-legacy.zip
index 0a4508d08..505578abe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.16-compact.zip
index f19e8d63a..529c8985d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.16-legacy.zip
index 5a3db4eb7..bee077248 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.17-compact.zip
index e613abf5b..3d9c16895 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.17-legacy.zip
index 5f62a2473..cb961827f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.2-compact.zip
index 0db59dd2f..4e544a72a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.2-legacy.zip
index a0b8d5391..a15021c2a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.3-compact.zip
index 5a8bbf1bd..978b731c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.3-legacy.zip
index 5ce66b32f..f070a2334 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.4-compact.zip
index d564dfac7..0462b1fe5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.4-legacy.zip
index 743e3b071..847531c9a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.5-compact.zip
index c04d1e762..8e92ca936 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.5-legacy.zip
index 3a1ca940c..9c29f8f9c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.6-compact.zip
index e42dedc48..804350393 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.6-legacy.zip
index 397b434ed..aaa8406fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.7-compact.zip
index 1539793ba..f3ef5556b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.7-legacy.zip
index fbba5d1a1..5b07e1ffe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.8-compact.zip
index fb91258fd..d63182772 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.8-legacy.zip
index b9445f29c..ed30bfe2c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.9-compact.zip
index 5e2f03ce7..6ebb5b9b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.9-legacy.zip
index 649c30dab..09aaebadf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.0-compact.zip
index 337b885a5..11c4ee2dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.0-legacy.zip
index ea84bf311..d07e0f60d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.1-compact.zip
index d95ae01b0..e351a7547 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.1-legacy.zip
index fad7526ae..8f77253ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.10-compact.zip
index 178fcfecc..27b608447 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.10-legacy.zip
index 4a70e1099..51d9e88bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.11-compact.zip
index 5ee7e660a..a13671103 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.11-legacy.zip
index af05007c4..2ab159e4e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.12-compact.zip
index b0ff9a7ae..c7189a5e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.12-legacy.zip
index 9331aa481..464eda1d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.2-compact.zip
index 947bd67e2..3a035d331 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.2-legacy.zip
index 5d505ee9a..99c58c3ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.3-compact.zip
index 44a25f2b8..7a8870372 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.3-legacy.zip
index 35a8a32ec..7f1d1b52a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.4-compact.zip
index 4061fd450..baaf693d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.4-legacy.zip
index 0430ca712..426722d65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.5-compact.zip
index e1d66952e..91df737e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.5-legacy.zip
index b3773068c..c17cfb53a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.6-compact.zip
index 653ef7cb5..8835c8023 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.6-legacy.zip
index 4b4ea1078..999c72fca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.7-compact.zip
index 9c7c6c6b2..422a984c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.7-legacy.zip
index e0a8dab1a..0a4c4d6f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.8-compact.zip
index 81684c265..8d25d37b2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.8-legacy.zip
index 6954bf0a9..5c06989d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.9-compact.zip
index 3e3448291..7d505cf66 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.9-legacy.zip
index 22595769d..a7f544a93 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.0-compact.zip
index 52eca1cf1..5a1503b05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.0-legacy.zip
index 469d9cb4c..9d2becb81 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.1-compact.zip
index bce57b481..f03da1c75 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.1-legacy.zip
index 936dd080f..0069bfc19 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.2-compact.zip
index 59d96dee7..ce702abba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.2-legacy.zip
index 73873ebee..73c51d448 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.3-compact.zip
index 28deb90ce..6b731f1e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.3-legacy.zip
index 66ad92fa2..f3566dc35 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.4-compact.zip
index 0f8f24d83..3c76b82a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.4-legacy.zip
index f9eade254..e19146980 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.5-compact.zip
index 4a1cfe73b..340233fb7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.5-legacy.zip
index 5ead8d405..070624993 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.6-compact.zip
index 260957a3e..15b7597e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.6-legacy.zip
index 7fd45ef1a..e625fd58c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.0-compact.zip
index 15711d50a..798611a3e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.1-compact.zip
index 93cfba900..1bbb1b828 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.10-compact.zip
index f4a88cd23..e3163e6a1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.11-compact.zip
index 7746f45b7..56829fc05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.12-compact.zip
index 9a74925f7..49727eaf3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.13-compact.zip
index c2847ecbc..027f46f34 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.14-compact.zip
index 7e285e335..9b7cda57c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.15-compact.zip
index 511c40b94..1f0077296 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.2-compact.zip
index db4e02fff..7d4125c50 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.3-compact.zip
index f62dcd636..76adfd92a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.4-compact.zip
index 03a47edbe..701bf43f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.5-compact.zip
index 3dc39c662..e1ee2bb39 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.6-compact.zip
index 5706c2c46..b68fcdaa0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.7-compact.zip
index 520a54643..1e18bd1ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.8-compact.zip
index 9a6af3ca5..440a0fcf1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.9-compact.zip
index f5c252e9d..6ff1e8940 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/emit-0.5.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.0-legacy.zip
index 42e365592..ed2ed8575 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.1-legacy.zip
index 182fcda76..59e19c08d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.10-legacy.zip
index 1d2295cf9..d712f7b32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.11-legacy.zip
index 733c91ebb..a68146cfd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.12-compact.zip
index 847fc5931..28d165389 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.12-legacy.zip
index 95a93ab25..eee26ef4f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.13-compact.zip
index ebcbd6269..d45a0a010 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.13-legacy.zip
index 9a57d8457..48239b1ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.14-compact.zip
index c0bea2b75..ccb4e2b6a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.14-legacy.zip
index e1d5b9844..0935b8871 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.15-compact.zip
index c061be22f..38c2ea3e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.15-legacy.zip
index b629384df..a295881fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.16-compact.zip
index dcf057fde..ccfdadc69 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.16-legacy.zip
index 8bbafb1c9..1f638b31b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.17-compact.zip
index 166afbe38..fd39895a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.17-legacy.zip
index e21bf7a07..5e1b668c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.18-compact.zip
index f8929e191..0722088a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.18-legacy.zip
index be652b454..f4d52bf97 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.19-compact.zip
index 0d1b8a4b3..5471bd0de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.19-legacy.zip
index d948db765..b1b84409d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.2-legacy.zip
index 6aaadbe50..111d0b57f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.20-compact.zip
index dd10f2f1d..f4c21eb81 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.20-legacy.zip
index dace47400..e3499ed8d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.21-compact.zip
index c6ed5bbd9..a99461e96 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.21-legacy.zip
index fe0b05b80..5bdbe6a9f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.22-compact.zip
index 5479c57bc..9df8770aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.22-legacy.zip
index 0e7d362e3..aa817ebf5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.23-compact.zip
index 4e5386124..df49e83be 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.23-legacy.zip
index 82ac61528..887b511ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.24-compact.zip
index 8ce39754a..cd18f70d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.24-legacy.zip
index 976f1ce92..1c9ef9913 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.25-compact.zip
index a178cef18..b461b4013 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.25-legacy.zip
index 20b062fcb..ca0e9ac9c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.26-compact.zip
index a73954689..c56de5e05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.26-legacy.zip
index 24131f409..d30828fea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.3-legacy.zip
index 72a73ffe1..94fd38e17 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.4-legacy.zip
index 9ea6edd49..bda46230c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.5-legacy.zip
index 14ff79ee9..2bf29d2d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.6-legacy.zip
index e0c0ae0fa..774a6508a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.7-legacy.zip
index f43c9d168..d3a80df38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.8-legacy.zip
index 926545fbb..0ddb6439e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.9-legacy.zip
index 6a4d08247..84e6b115d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.0-compact.zip
index eea2baa22..3e030077f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.0-legacy.zip
index 49c178125..8f7b26cad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.1-compact.zip
index 03c622a80..4480b04de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.1-legacy.zip
index 13354bb5a..3388032d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.10-compact.zip
index eba9310f3..8763ccaff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.10-legacy.zip
index a19c80bac..12b9647d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.11-compact.zip
index 649c47336..a6bff4cf9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.11-legacy.zip
index cb29acc43..6fa876685 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.12-compact.zip
index 474de3b1e..e1c1167db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.12-legacy.zip
index b5c15a7f7..ae4170e1d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.13-compact.zip
index 1836a1d0a..f3f26acf1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.13-legacy.zip
index 4be42272f..b254328b2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.14-compact.zip
index 59928a770..1d226e8b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.14-legacy.zip
index 4780807af..4342042ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.15-compact.zip
index 1c8396724..2ce37f88f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.15-legacy.zip
index 911e63f3f..93bdec47a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.16-compact.zip
index 03b9cb113..56f805da9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.16-legacy.zip
index 84f246afb..17ca6ee7f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.17-compact.zip
index 8777c9694..1505771af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.17-legacy.zip
index f038fe0ec..a4ee82f56 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.2-compact.zip
index 46eb2e5db..f54ebb309 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.2-legacy.zip
index d73f84641..4564e5c17 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.3-compact.zip
index f972f5a83..39850eba3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.3-legacy.zip
index 80c57790d..748584a5a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.4-compact.zip
index 25c70f948..bfc34e987 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.4-legacy.zip
index 499bee6ee..b2d71f622 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.5-compact.zip
index 1eb32ce7e..ee23a2d8a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.5-legacy.zip
index a4a189532..989e8bf15 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.6-compact.zip
index e924a82be..400bc1ee6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.6-legacy.zip
index 025ff1f6a..6f59ff7e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.7-compact.zip
index c5ce74a84..646110cf1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.7-legacy.zip
index b8bef3a72..e4dd2d2d8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.8-compact.zip
index 10e64fa0a..70068028f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.8-legacy.zip
index 2d7e78531..0c1056271 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.9-compact.zip
index 60022ad02..a57f15de7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.9-legacy.zip
index f6619e2a3..ec15a55d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.0-compact.zip
index ee8abedd5..0cff8cd46 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.0-legacy.zip
index 2f9b9fd6b..50d69b942 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.1-compact.zip
index dfc8ce4f0..464617851 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.1-legacy.zip
index d69684e43..62151f808 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.10-compact.zip
index 3769b7feb..bbe0d50cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.10-legacy.zip
index f192bec49..0238596ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.11-compact.zip
index a2f2963a2..27c85d3fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.11-legacy.zip
index 9ecec2dfd..bc6acf542 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.12-compact.zip
index 5af920b84..305b87ac1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.12-legacy.zip
index f6b6a4590..9c106f287 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.2-compact.zip
index 7bd270f1f..c21f36fbe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.2-legacy.zip
index 3d6a64372..4db23f9af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.3-compact.zip
index d8b55e499..e53c76a3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.3-legacy.zip
index 936823432..73ec29238 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.4-compact.zip
index ed80ccf1e..1d90edf0a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.4-legacy.zip
index 62ba55910..0b19b99af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.5-compact.zip
index 972ae4f21..70ffbd8e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.5-legacy.zip
index 558e7cd31..679f81dfa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.6-compact.zip
index eca832767..2ba7b5fcb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.6-legacy.zip
index b5be7162a..0ede4d458 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.7-compact.zip
index bf57d9443..a2851ec82 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.7-legacy.zip
index 94b57e1d9..1996c9855 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.8-compact.zip
index 4def9f0bb..324163408 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.8-legacy.zip
index 4e15f66c5..f714f6d97 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.9-compact.zip
index 10c63c889..e9e55ea8b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.9-legacy.zip
index c11145a09..d9208d6c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.0-compact.zip
index 3edaf8f73..e771157dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.0-legacy.zip
index 7931b44f2..f668b17b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.1-compact.zip
index f330b053a..75e93b989 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.1-legacy.zip
index a7f408ab8..56bf0b703 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.2-compact.zip
index 8402ce494..536279789 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.2-legacy.zip
index a24020a29..983326dae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.3-compact.zip
index d450c6f57..f692f54ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.3-legacy.zip
index bb9408a0a..d4f101740 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.4-compact.zip
index c65f559eb..63fad54a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.4-legacy.zip
index 723ded4ab..a06153d69 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.5-compact.zip
index bfb410a9e..fc0c7d312 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.5-legacy.zip
index 1d0e0311a..e4d692fd9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.6-compact.zip
index 1823afefd..d4b6cdc41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.6-legacy.zip
index 825542eca..8335adc90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.4.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.0-compact.zip
index 0c1ec2336..2ea6b6948 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.1-compact.zip
index 2242c5a31..495180338 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.10-compact.zip
index ba654e261..267c2e52d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.11-compact.zip
index abb17e561..4df45cb9a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.12-compact.zip
index 87a5c095c..635b5f174 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.13-compact.zip
index 0535039b0..a791073f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.14-compact.zip
index 7b9bf9990..e4ddb7bb2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.15-compact.zip
index 560485005..b126d556a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.2-compact.zip
index 6ebcebcf8..154c906ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.3-compact.zip
index ad22b4aae..508c345d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.4-compact.zip
index d7aa64769..33e79f198 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.5-compact.zip
index 5d9c03ec6..742ed7c61 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.6-compact.zip
index af0d9dc13..69a3953c8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.7-compact.zip
index ee6e3fdf4..b0985ec6b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.8-compact.zip
index eb8261c8b..4f04ce3e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.9-compact.zip
index 9940ee49a..3bde92873 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/enum-0.8.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.0-legacy.zip
index 41cfce309..eeb1e434f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.1-legacy.zip
index 8922a50f7..4aea738d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.10-legacy.zip
index 1a3f53314..40bf973ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.11-legacy.zip
index 09f5e898c..9317163c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.12-compact.zip
index 75dcf6646..8d190e7e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.12-legacy.zip
index 5f6994d3e..081478145 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.13-compact.zip
index 1d85fe078..2c0c50d56 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.13-legacy.zip
index b6c5909ad..6c9e4e6e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.14-compact.zip
index eb015f078..3de780b2f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.14-legacy.zip
index ce27dd0e3..2de97b80d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.15-compact.zip
index a46d4b471..7d873aca0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.15-legacy.zip
index d7232bf40..38d3fd97b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.16-compact.zip
index 38f65a8e5..6da7d951f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.16-legacy.zip
index 5eb92a786..3678f1f55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.17-compact.zip
index 57bd35641..6bf1a944b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.17-legacy.zip
index f0bc614ed..97bb1f894 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.18-compact.zip
index 4ee743500..32be42bef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.18-legacy.zip
index e2ac3402d..1fa477900 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.19-compact.zip
index d35c61e7a..91a2783f2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.19-legacy.zip
index f50298c5b..043e82a61 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.2-legacy.zip
index 1171dee00..6a13a4f59 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.20-compact.zip
index cbdd14c3a..5420fa5fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.20-legacy.zip
index 149920cc9..9fcad7c10 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.21-compact.zip
index bb7333022..92177ca29 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.21-legacy.zip
index 6e6eaff00..1efcc586a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.22-compact.zip
index c5a09d8dc..065893569 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.22-legacy.zip
index 51f7b8dd3..2961dfc10 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.23-compact.zip
index 14a0d696e..a4b51b38c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.23-legacy.zip
index 8149c1d37..42db929dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.24-compact.zip
index b5de1f92e..772b2e477 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.24-legacy.zip
index 5dd2b48ae..a7c80a592 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.25-compact.zip
index 3e60b5460..8a604fd58 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.25-legacy.zip
index 755402615..0cd33af52 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.26-compact.zip
index c05327e10..376657232 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.26-legacy.zip
index 2044fe03d..43ad664b7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.3-legacy.zip
index d375e8ffd..3995b217e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.4-legacy.zip
index a07285b40..8a56858df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.5-legacy.zip
index f3e749bb3..57d979c12 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.6-legacy.zip
index 1c81e3481..81bc3934f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.7-legacy.zip
index 0d2c9d74b..47b42f07e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.8-legacy.zip
index 6711806e8..40a137887 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.9-legacy.zip
index 3b06278f3..fb58325ad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.0-compact.zip
index 8302b1f44..87904cf36 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.0-legacy.zip
index 62bde0d0b..d831efdf4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.1-compact.zip
index 1b0e6921f..e153ce0bd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.1-legacy.zip
index a42223e83..7ae757b57 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.10-compact.zip
index a9580d652..921315e9e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.10-legacy.zip
index 935c70c8c..a795e6bad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.11-compact.zip
index 9e5bf3866..f8aab88f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.11-legacy.zip
index bdfb8c55c..d9580cd3e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.12-compact.zip
index 5297ae320..aceae17e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.12-legacy.zip
index a622bd0f9..72dd0d2d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.13-compact.zip
index 6fdc10591..a4ce01299 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.13-legacy.zip
index e31dbf160..b9a3ad883 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.14-compact.zip
index ce01ef693..0dff20a84 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.14-legacy.zip
index 6fc2673fc..6a42af526 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.15-compact.zip
index 4e095aa89..68bca6e05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.15-legacy.zip
index 8df81da80..f996a8435 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.16-compact.zip
index cac3f7d98..7821ddb0c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.16-legacy.zip
index 9300cc80f..df8b0dc38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.17-compact.zip
index 8b1718e9f..543be13ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.17-legacy.zip
index 19ca81931..f71273ec1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.2-compact.zip
index a0812d2fb..fbf388ae4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.2-legacy.zip
index d964bf9db..bf32217f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.3-compact.zip
index 1b926f42f..fd9aceaed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.3-legacy.zip
index c52594c55..6b8d4b94d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.4-compact.zip
index a4a820841..6ab0bf5ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.4-legacy.zip
index dfb967f8b..d2e4ffb34 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.5-compact.zip
index 590ed37d3..8ce9480fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.5-legacy.zip
index d67201635..4b75c9f49 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.6-compact.zip
index a7b299c2d..728a94f2e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.6-legacy.zip
index 5bf6b25b9..39eaa0c1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.7-compact.zip
index a2d4166b5..5eb5c2aee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.7-legacy.zip
index 6c8321643..ce88477ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.8-compact.zip
index a0b026c1e..d9546e98b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.8-legacy.zip
index bc8cb5dca..a653d43ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.9-compact.zip
index fc20617ca..7b4dc6744 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.9-legacy.zip
index 9103b1860..4be4157d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.0-compact.zip
index 2dfb9502b..c8fc86124 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.0-legacy.zip
index 50f002f24..28a5ddd71 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.1-compact.zip
index a9967871d..82434547c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.1-legacy.zip
index 39de9ea92..9562cb9b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.10-compact.zip
index d97a78ef3..fa45d9038 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.10-legacy.zip
index df238cace..14e459b97 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.11-compact.zip
index 2ad5473ea..a4569de01 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.11-legacy.zip
index 622a815e4..8ed1d2721 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.12-compact.zip
index 269279a4d..6540dac0f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.12-legacy.zip
index aa46071b5..9eadb8082 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.2-compact.zip
index 1e89f5bf9..b9d83478f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.2-legacy.zip
index e5d873819..09df49b5d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.3-compact.zip
index a575fd395..b53fa396a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.3-legacy.zip
index d9b1a34bb..c0b7c89ad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.4-compact.zip
index 94527eaa2..905f3d514 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.4-legacy.zip
index 502d25848..5a0270c2e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.5-compact.zip
index 9eb00fc54..c06e8e089 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.5-legacy.zip
index ff821d895..34aa9c13a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.6-compact.zip
index dec38765c..4163fdd37 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.6-legacy.zip
index 22ffe3187..9a2a1f386 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.7-compact.zip
index 5cd1b9b9b..f818992f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.7-legacy.zip
index 9f5f218b8..c6bf479c8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.8-compact.zip
index 6ef4c9f80..9ddd82d5d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.8-legacy.zip
index 880c0ee98..a4fa9d70b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.9-compact.zip
index a1a7e2b32..4e74ffb44 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.9-legacy.zip
index cdbca1611..cde4a4859 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.0-compact.zip
index 0ad13f506..1ba7da116 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.0-legacy.zip
index 0f0b6153e..e20cfa0af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.1-compact.zip
index 2e5281a2b..2417cb756 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.1-legacy.zip
index 31a3f0dfe..31820d3e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.2-compact.zip
index 99b811d42..70fa8ec4b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.2-legacy.zip
index 2b0715402..e9ca2acf6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.3-compact.zip
index 2f1040eb5..582c9f40a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.3-legacy.zip
index 9f15a3205..28f1ca395 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.4-compact.zip
index 98fd52a74..bf1f6547c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.4-legacy.zip
index 642b1830e..a880f57d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.5-compact.zip
index 24e47d8ea..f0b808d12 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.5-legacy.zip
index f6f3db973..9160e8a23 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.6-compact.zip
index ee6a74f17..7e451ded2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.6-legacy.zip
index 452d981af..475d714a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.0-compact.zip
index 5a70c8b59..3c042b05a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.1-compact.zip
index 5ec55738b..d31e7c8fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.10-compact.zip
index 9bb0c98b5..d56908c21 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.11-compact.zip
index cc8bc068f..ac3615f1c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.12-compact.zip
index 9a7cf92a0..dba212cb2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.13-compact.zip
index 8df293c03..59e6c98d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.14-compact.zip
index 4ac15f98f..c672e79e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.15-compact.zip
index f934cfe02..b9d75661e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.2-compact.zip
index bdaf04a40..34c1ef599 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.3-compact.zip
index 451459295..9c82e2181 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.4-compact.zip
index 73a21a916..902a6aa73 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.5-compact.zip
index e34dbbe2c..34239f0b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.6-compact.zip
index 8d4c7fe17..5695834ea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.7-compact.zip
index 9b155d756..430b0daad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.8-compact.zip
index 7b1241bff..093680393 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.9-compact.zip
index bc311c310..86fab8d40 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/event-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.0-legacy.zip
index 0e7ecfd82..a9001a53e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.1-legacy.zip
index 4b8b06aef..74c645e24 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.10-legacy.zip
index 464634eae..a8790f220 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.11-legacy.zip
index d95541815..ed2e6b16a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.12-compact.zip
index 000e3b45e..9514782a0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.12-legacy.zip
index e61dd16f2..0b520db74 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.13-compact.zip
index d4bffed42..e6753c3bd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.13-legacy.zip
index 7fb378140..fdad9b4d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.14-compact.zip
index 54fe97787..bd1a83980 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.14-legacy.zip
index b8da1971b..bcbabd378 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.15-compact.zip
index f45b9ddf2..6eb7fc26e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.15-legacy.zip
index ee5033cbb..aa4a666e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.16-compact.zip
index 46b5bfe63..926351b60 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.16-legacy.zip
index 00d030a78..6b0bafe88 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.17-compact.zip
index b3b79d9b0..ad0c976fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.17-legacy.zip
index 33af77d9d..26858d6f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.18-compact.zip
index 2864715ad..dbba21f07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.18-legacy.zip
index f42a94cf3..541881bb0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.19-compact.zip
index c4051e43f..1cbbb43db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.19-legacy.zip
index f6845ce89..a7ec38333 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.2-legacy.zip
index 862a3e8a5..574cd2760 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.20-compact.zip
index 423b61dcb..608713163 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.20-legacy.zip
index bf336cb62..6afe0336e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.21-compact.zip
index e36cee6a8..f5059d3b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.21-legacy.zip
index dd8bd0c63..bb7262c89 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.22-compact.zip
index 5ac088736..6c029c27b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.22-legacy.zip
index 9d2849c77..c8f096e52 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.23-compact.zip
index 92ed004e9..2d2341db9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.23-legacy.zip
index 613b80e5d..7e7a73f4f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.24-compact.zip
index a89dd0634..c83e3a05f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.24-legacy.zip
index e6c87a8df..344c55932 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.25-compact.zip
index e69b72d03..20e6a1cd9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.25-legacy.zip
index d07e06501..4921f3c5e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.26-compact.zip
index 94c60c37b..5ebd78af0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.26-legacy.zip
index 29b43d821..3ec8879d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.3-legacy.zip
index 88cfd2460..3b0897720 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.4-legacy.zip
index 1ddfa2832..abeeae1ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.5-legacy.zip
index 88cb6807f..8b56de480 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.6-legacy.zip
index 39a66ab3f..89a2f9125 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.7-legacy.zip
index d793e3075..150cac462 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.8-legacy.zip
index b987de471..33ccd89d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.9-legacy.zip
index 59430dcd2..29adce004 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.0-compact.zip
index dc0894f64..9f93cf5e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.0-legacy.zip
index f2d6048bd..7926919c2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.1-compact.zip
index d5065f38c..58385f989 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.1-legacy.zip
index 864062992..f19896ce8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.10-compact.zip
index 008446760..df7ab3043 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.10-legacy.zip
index 0325a1f73..fea17c631 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.11-compact.zip
index 1b90ead8d..2dc7c9dd7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.11-legacy.zip
index b0d9b9f1b..bd1480966 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.12-compact.zip
index ddb0ce75e..63731de85 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.12-legacy.zip
index 1a239c167..bcd0a023f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.13-compact.zip
index 289f54034..8bcce2ea7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.13-legacy.zip
index f0e3ed723..2d3d04851 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.14-compact.zip
index e2047da30..079f150f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.14-legacy.zip
index b2509f621..c7668a3ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.15-compact.zip
index d93e22a2b..37283c217 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.15-legacy.zip
index feb3239d0..49176747e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.16-compact.zip
index a1cde339d..42bcafa3d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.16-legacy.zip
index c518518e9..e60d35ae8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.17-compact.zip
index 9b497e080..e232fbdbd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.17-legacy.zip
index d7d84d402..15f0dbc38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.2-compact.zip
index 1a1dde7e2..ac3577547 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.2-legacy.zip
index f3874eb2e..3bd3b09bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.3-compact.zip
index 1e0640a36..af810fca7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.3-legacy.zip
index c3c04c3b6..6829d7e27 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.4-compact.zip
index fb506255c..1825beecf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.4-legacy.zip
index d1d100933..d41df7564 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.5-compact.zip
index dc7f25353..c36690933 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.5-legacy.zip
index 6e7a45ad1..92a818ca7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.6-compact.zip
index c6aaa4cf1..a82ecc0bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.6-legacy.zip
index 45c4c64bc..027bde5c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.7-compact.zip
index ffa4da591..a4ea7131a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.7-legacy.zip
index 861dc63be..0ac427996 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.8-compact.zip
index ab0d2de45..67fe83241 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.8-legacy.zip
index a3196c80c..ec349aeb7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.9-compact.zip
index 9134c177f..e699ab39d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.9-legacy.zip
index 8840fa940..5aa69b0b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.0-compact.zip
index 3257caed3..c52e2be54 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.0-legacy.zip
index 8eaa9763c..357745490 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.1-compact.zip
index 9b3ed9a6b..8571945c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.1-legacy.zip
index 9e8210a12..9d39aff16 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.10-compact.zip
index 8586dedac..e39cca94d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.10-legacy.zip
index 1fea0803c..d23210600 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.11-compact.zip
index 84e706c2a..b7162682d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.11-legacy.zip
index 4a27c4354..0b6fd4d6c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.12-compact.zip
index 3541cfa8a..416c49585 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.12-legacy.zip
index a3d0fe4a8..c78cce42e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.2-compact.zip
index 737a677af..a3012ca5f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.2-legacy.zip
index f2e4b831e..0f82232f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.3-compact.zip
index c98ef1b6a..036620508 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.3-legacy.zip
index 768b045d4..b97f85552 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.4-compact.zip
index 8ee1b8b73..77ddb08d9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.4-legacy.zip
index f4f3861e5..fad07312e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.5-compact.zip
index 266c8c479..2fb321b14 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.5-legacy.zip
index 641d1fe7f..87bf0fd67 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.6-compact.zip
index a0fa0abda..26764a5b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.6-legacy.zip
index 7088297b3..fb829562c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.7-compact.zip
index 18f99ab6a..80d6aaebd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.7-legacy.zip
index 85444d1f4..167ce8e88 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.8-compact.zip
index 30ed7a086..950418bc1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.8-legacy.zip
index a780e335e..784b43414 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.9-compact.zip
index f438e15bb..3a57badcd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.9-legacy.zip
index 9d438a89b..24e066e24 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.0-compact.zip
index 9cc488835..c34fd042d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.0-legacy.zip
index 9d843fe50..e5bdb7b42 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.1-compact.zip
index fbd37237f..7d547f226 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.1-legacy.zip
index 3ffdb8e9f..bf1c8111a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.2-compact.zip
index 0f5a770d2..8e38a7eb6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.2-legacy.zip
index 43feec3a6..7c3b58c20 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.3-compact.zip
index 174c54797..d80f5ae7b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.3-legacy.zip
index 0df417c82..8cfad99bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.4-compact.zip
index cf4667c93..32faea333 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.4-legacy.zip
index 2d3444748..5fe333740 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.5-compact.zip
index 097c7bcf6..6bfe250ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.5-legacy.zip
index d10449dbe..e09c39961 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.6-compact.zip
index 76f28c356..d15527941 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.6-legacy.zip
index 952bd90d5..6cdced5b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.0-compact.zip
index 6ab94cd13..0af224bcc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.1-compact.zip
index 0e7c2be97..784401283 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.10-compact.zip
index ac14894f0..ddbba1b5e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.11-compact.zip
index 3355fdaf7..f17e88343 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.12-compact.zip
index 10df4deef..99da4d4d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.13-compact.zip
index a0f36910f..0fb0cea8d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.14-compact.zip
index be8cabc87..463e77fed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.15-compact.zip
index 61da5bf91..e39b39734 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.2-compact.zip
index 93e318759..7e37c44d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.3-compact.zip
index 31daad84a..db836e2af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.4-compact.zip
index e6ce5a116..8ec37542a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.5-compact.zip
index 8f37be093..bcc2c9168 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.6-compact.zip
index 26eef1c92..1438af259 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.7-compact.zip
index f118ba4e3..fcecfd882 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.8-compact.zip
index c4bf85326..8e3779dda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.9-compact.zip
index ad0dc6016..85836dfaf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/for-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/free_functions/libraries_from_free.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/free_functions/libraries_from_free.sol-0.8.12-compact.zip
index 13d54539f..b06a5fc49 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/free_functions/libraries_from_free.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/free_functions/libraries_from_free.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/free_functions/library_constant_function_collision.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/free_functions/library_constant_function_collision.sol-0.8.12-compact.zip
index da8a53503..73e436ff6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/free_functions/library_constant_function_collision.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/free_functions/library_constant_function_collision.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/free_functions/new_operator.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/free_functions/new_operator.sol-0.8.12-compact.zip
index 7135e729d..d8b2c1404 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/free_functions/new_operator.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/free_functions/new_operator.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.0-legacy.zip
index 4f416ed46..738ab973c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.1-legacy.zip
index e86518acf..9fff086f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.10-legacy.zip
index 417498f09..d1a4ddee6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.11-legacy.zip
index 897c38c1b..c31201a53 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.12-compact.zip
index 654e6b1fd..2fd19da52 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.12-legacy.zip
index 86d3cf909..bbedbe58c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.13-compact.zip
index 47f901a1e..4dccab2be 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.13-legacy.zip
index 3999b2463..21c5e35f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.14-compact.zip
index 15f1a7a17..e87c7ba46 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.14-legacy.zip
index f66a39b13..1e75c432d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.15-compact.zip
index cd0be444b..4de5ed58a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.15-legacy.zip
index efa1b9dfe..cbac3f90a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.2-legacy.zip
index 8818adffc..e6ecc8b2a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.3-legacy.zip
index 5e7cbe74d..e04979d90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.4-legacy.zip
index e70747cc7..b5016aead 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.5-legacy.zip
index 94556c41c..4b2487535 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.6-legacy.zip
index 92d478f99..2cee5d5c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.7-legacy.zip
index 1a630b9d9..95ba73c47 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.8-legacy.zip
index b3d23857f..12e95df39 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.9-legacy.zip
index 68f7cd813..12e7951cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.16-compact.zip
index 26439fce5..d40327d45 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.16-legacy.zip
index f06d532f4..f89cc1b17 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.17-compact.zip
index ac1870546..45e5d1b29 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.17-legacy.zip
index 61a7e6571..c8ca57311 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.18-compact.zip
index 430775bb3..b6eea6607 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.18-legacy.zip
index b3666551a..56cce6218 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.19-compact.zip
index b4b6c0fb4..86e23ec9e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.19-legacy.zip
index 2759cc020..b25eb6294 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.20-compact.zip
index 93c34629a..cd4e6723f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.20-legacy.zip
index 5578a43b7..ae600f1fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.21-compact.zip
index d9fd2e94e..7eb4c09bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.21-legacy.zip
index 42c803d01..1e6e2c355 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.16.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.22.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.22.sol-0.4.22-compact.zip
index d3b21639c..102f774d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.22.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.22.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.22.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.22.sol-0.4.22-legacy.zip
index e7a75691a..c1f9bfedc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.22.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.22.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.23-compact.zip
index d13d7b5fd..985358a1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.23-legacy.zip
index 9d473cb69..51183a091 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.24-compact.zip
index 3fbcbf7b7..38ea5ba2f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.24-legacy.zip
index cb9f9cd7e..cd61de563 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.25-compact.zip
index 2c3df3bc3..9b01bd05d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.25-legacy.zip
index 87643ffc7..420eb671e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.26-compact.zip
index 585f5217a..abe46f254 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.26-legacy.zip
index 0ab3f1343..a598e67d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.4.23.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.0-compact.zip
index 34f014341..0410aa6b7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.0-legacy.zip
index 331e3631b..10cb3f9ed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.1-compact.zip
index 8c3e2c1c1..3f4ee3830 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.1-legacy.zip
index 14465b4c5..8643403bc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.10-compact.zip
index b2432fdd4..a62f0e0f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.10-legacy.zip
index 94b028b85..120ee105f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.11-compact.zip
index cea4dc963..29f09be42 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.11-legacy.zip
index 7b615ae82..bed0cb3f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.12-compact.zip
index c732d5a7b..4c05e5484 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.12-legacy.zip
index a63405cc8..b32ecca39 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.13-compact.zip
index 1f6813c8c..e13888302 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.13-legacy.zip
index 1484777a5..bda6e392e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.14-compact.zip
index 027bcfb21..9ab3a42d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.14-legacy.zip
index df82d3953..77ca2a539 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.15-compact.zip
index 32e272701..ec04e350d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.15-legacy.zip
index 18ccb770e..ada52d9e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.16-compact.zip
index 98492edb2..89c464075 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.16-legacy.zip
index 5abc47f1a..527ec72d6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.17-compact.zip
index efabd518c..d4ecadf74 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.17-legacy.zip
index 98f4c91d1..21b78d779 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.2-compact.zip
index 1ca4940d9..fbe59eb6a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.2-legacy.zip
index 78cd0511c..70bcfe804 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.3-compact.zip
index 1ab29983e..421056633 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.3-legacy.zip
index 480993a2b..66f12a305 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.4-compact.zip
index 5155013ac..ef8105d6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.4-legacy.zip
index 46702e826..90047f421 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.5-compact.zip
index ffac76dfb..77e653fbf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.5-legacy.zip
index 40912318b..b8f83b7a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.6-compact.zip
index fe8718dce..369060bb6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.6-legacy.zip
index 2f8b9313e..d8b17aece 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.7-compact.zip
index 78d2dcaea..36712bab3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.7-legacy.zip
index 31057e7cd..bc5ec65a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.8-compact.zip
index 098b5437e..cc63ddea6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.8-legacy.zip
index 8a0caeae9..ab21ac932 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.9-compact.zip
index c715bfaac..0726edd87 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.9-legacy.zip
index 208f761a0..8fea1f133 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.5.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.0-compact.zip
index c39c691a9..e5f45a459 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.1-compact.zip
index df6befa49..3c90cdbc2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.10-compact.zip
index a60e6ebd5..f5a3d828f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.11-compact.zip
index 6ae6f503f..bb113c38e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.12-compact.zip
index 7ba66abb8..5d7b9fb63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.2-compact.zip
index 86b838eca..d62fec759 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.3-compact.zip
index 9bff11892..e2286e7d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.4-compact.zip
index 917541d19..612579eda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.5-compact.zip
index 7729905f8..ad9cc0f73 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.6-compact.zip
index 4b491b529..f8b35f305 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.7-compact.zip
index 5fa358ce3..6f5735650 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.8-compact.zip
index 65d1cc1e1..0169c6972 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.9-compact.zip
index fd65bc8ba..116cb8429 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.6.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.1-compact.zip
index 9737d2572..8a8c58b98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.2-compact.zip
index f544cf84e..86a6f6282 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.3-compact.zip
index ca1a7d08a..d1c6b5c3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.4-compact.zip
index e014608ef..a6f4001bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.5-compact.zip
index 173d982a4..15a348355 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.6-compact.zip
index 63004fba8..c56d63464 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.0-compact.zip
index d39350e02..caa5cd00c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.1-compact.zip
index aaa6e8352..4981b2255 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.10-compact.zip
index c123117a8..42d9ca6e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.11-compact.zip
index 1bd0b671f..d61f51593 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.12-compact.zip
index 2b95359b2..123c1142a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.13-compact.zip
index d49dc3e3e..ed77e4189 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.14-compact.zip
index 546cb8f3f..9afe7546b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.15-compact.zip
index bb40cc0ff..74117a306 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.2-compact.zip
index c8cd20598..485a07feb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.3-compact.zip
index c27432574..601c7e221 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.4-compact.zip
index fa5206159..8e09c927e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.5-compact.zip
index 8d2673944..717fcdb68 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.6-compact.zip
index e50560714..7b9ed9b05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.7-compact.zip
index 590fa61ab..e7976fdc7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.8-compact.zip
index cca2723b5..00f1d6d82 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.9-compact.zip
index 3cd07f7a6..2d765e585 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/function-0.7.1.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.0-legacy.zip
index 1a08dcf6d..062e0e1b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.1-legacy.zip
index 7b9fdb07d..036a78b24 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.10-legacy.zip
index d7b5ebe65..b1f4cb035 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.11-legacy.zip
index f5a7dff79..6e0e2fb3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.12-compact.zip
index f47b8e99b..7934d5793 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.12-legacy.zip
index 795897f98..257ab4367 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.13-compact.zip
index 6fdbf5b62..fceb34175 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.13-legacy.zip
index 684042239..26009e797 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.14-compact.zip
index 39a55b19a..f134a1796 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.14-legacy.zip
index 16c1b7dc2..23c435290 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.15-compact.zip
index d4a452eb3..8d1c27c83 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.15-legacy.zip
index 68707d335..ac4994be5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.16-compact.zip
index d2c7ec782..51f31a118 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.16-legacy.zip
index 18d1a671e..c879b0055 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.17-compact.zip
index f05dad2af..c462e7937 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.17-legacy.zip
index 6cb68c859..61b9a0618 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.18-compact.zip
index bb9a97a5d..91ab6380a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.18-legacy.zip
index 9df114d1e..0c417105b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.19-compact.zip
index 135c56bb5..1ae6d9e9c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.19-legacy.zip
index ccba10a8f..9f54fd148 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.2-legacy.zip
index 4a899b691..1104cab41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.20-compact.zip
index a1a80d7ac..a0fd93db7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.20-legacy.zip
index 7e70c45b5..f2bbf8239 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.21-compact.zip
index 0a06f236a..6329db085 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.21-legacy.zip
index 4279249d1..80c51ed8d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.22-compact.zip
index 6b0d70dfb..afaa41f1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.22-legacy.zip
index b0db936e2..37ea6d2fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.23-compact.zip
index b69f6dc3f..a7fc4a83c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.23-legacy.zip
index 4729aceb1..9cfdd8d11 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.24-compact.zip
index 7b6ad40d7..1833bbc84 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.24-legacy.zip
index fd956efc1..01c68e581 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.25-compact.zip
index ac90b7c66..5ec7d7c65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.25-legacy.zip
index 6bdac8116..b52c3e136 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.26-compact.zip
index 0db474b42..eaf64d514 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.26-legacy.zip
index 3aec7df46..5b664fa18 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.3-legacy.zip
index 92cb63d49..75383a433 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.4-legacy.zip
index 94934d55d..f6271841e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.5-legacy.zip
index 2de64b546..c2ed8db4c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.6-legacy.zip
index d41f2a204..b48e84c20 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.7-legacy.zip
index 70e945415..055080fa9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.8-legacy.zip
index b8b57f603..af2e337e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.9-legacy.zip
index b3c0814dd..219352c0e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.5-legacy.zip
index 0c8f7bb82..8b3445c39 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.6-legacy.zip
index 22e64909e..3f8b39a36 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.7-legacy.zip
index 8548ecbe7..e561436bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.8-legacy.zip
index ffcc304dc..53c55295e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.9-legacy.zip
index 0e318afef..2db3cfd84 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.4.5.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.0-compact.zip
index 6d3c5f87a..1559abff9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.0-legacy.zip
index 0e586ae3c..982849838 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.1-compact.zip
index c972ac6e9..f6dde72a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.1-legacy.zip
index 04423349d..10e4b70e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.2-compact.zip
index 0daeb916c..d6f562e3b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.2-legacy.zip
index d0774f196..6aa386e96 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.10-compact.zip
index 389e514e8..77fa9260e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.10-legacy.zip
index c58de1d49..5b65accf2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.11-compact.zip
index e5d8a0454..2122b241d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.11-legacy.zip
index d87b88f20..d31b283e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.12-compact.zip
index 976c612b8..d05bc0f3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.12-legacy.zip
index deb8d5234..bd1baa647 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.13-compact.zip
index e184010ca..5c69bd1c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.13-legacy.zip
index 2a6de297c..abe039efa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.14-compact.zip
index 6a6f57dcf..f69452356 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.14-legacy.zip
index bd2ecc4b9..d32a94dd8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.15-compact.zip
index f1bbc0a29..b481191fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.15-legacy.zip
index 85142b955..51543f1e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.16-compact.zip
index 34a58cffa..1e348ad3d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.16-legacy.zip
index c37899fad..28f53ceb0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.17-compact.zip
index 36c3cbd60..9b344634a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.17-legacy.zip
index 081776bfa..94d03767e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.3-compact.zip
index 46f3c302d..1b05ad988 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.3-legacy.zip
index cdce329f7..c45173239 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.4-compact.zip
index 48016bc89..cc9750221 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.4-legacy.zip
index dff240c43..fd7991d6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.5-compact.zip
index 20f67ac83..8dff8adf9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.5-legacy.zip
index 117a57631..2d19c22a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.6-compact.zip
index eececc61a..defdde12d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.6-legacy.zip
index 867541314..ce755d7da 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.7-compact.zip
index 5a2140f79..8ecc23e61 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.7-legacy.zip
index 1649fbd49..5248e3d1e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.8-compact.zip
index b74b424e1..fa9577878 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.8-legacy.zip
index fa667a0c8..4e86bba9d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.9-compact.zip
index 190d8c228..29ba806a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.9-legacy.zip
index 6c7667daf..ba3b66302 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.5.3.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.0-compact.zip
index 04ab2307e..2530f68f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.0-legacy.zip
index bc7f1882b..c68e9b6bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.1-compact.zip
index 5364e8ccc..6e837458a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.1-legacy.zip
index 9eb435132..148d49894 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.2-compact.zip
index 826b6b676..83507649f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.2-legacy.zip
index efe64a49e..5501d9358 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.3-compact.zip
index c7b5be20b..fb73de5c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.3-legacy.zip
index ee9aaf046..ffa19cf40 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.4-compact.zip
index 09e9cd219..8cdc5054f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.4-legacy.zip
index c8921a8a0..b70297d64 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.5-compact.zip
index 77593e249..e8cf27d34 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.5-legacy.zip
index 4b523fcb4..2f55feeb2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.6-compact.zip
index 4688b3c36..428e400b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.6-legacy.zip
index e9768f541..9d648def9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.7-compact.zip
index 1cd52c97b..a06775475 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.7-legacy.zip
index 848581615..66fd4f752 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.2.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.10-compact.zip
index 53a510ee7..e0c313039 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.10-legacy.zip
index e757a7c52..424ef97e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.11-compact.zip
index c49d1b248..47cfd9334 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.11-legacy.zip
index 4eceb5a2f..399ab6c76 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.12-compact.zip
index 4ad636f54..22d2e62aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.12-legacy.zip
index 8949bb06c..9dbf52188 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.8-compact.zip
index e8115417e..06b4834c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.8-legacy.zip
index 4443223f0..085841efb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.9-compact.zip
index 084fa7a11..e9dfcc0a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.9-legacy.zip
index d52defd18..60740dad8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.6.8.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.0-compact.zip
index fe60ac579..50feb3cae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.0-legacy.zip
index 0551bb57a..de736a9c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.1-compact.zip
index 4e588d32a..42e3936ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.1-legacy.zip
index 254a30df4..0adb789c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.2-compact.zip
index 64dbf275d..f48492517 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.2-legacy.zip
index cefa7ee3c..cbabca3a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.3-compact.zip
index de4b6f034..76e996d16 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.3-legacy.zip
index 4472c5dcb..57ffef33c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.4-compact.zip
index 1a0350f0c..2846c192d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.4-legacy.zip
index 68ea9cb11..0b9fa8054 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.5-compact.zip
index 87bff19bd..7478f63fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.5-legacy.zip
index 5e4fbaacc..017c56a14 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.6-compact.zip
index 5fcb08341..d22024018 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.6-legacy.zip
index 6a6488afb..20fdd6811 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.7.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.0-compact.zip
index 0a9c28802..8dd2f12c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.1-compact.zip
index 763c1b475..332cab5ea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.10-compact.zip
index 5d8e320f3..eedc75316 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.11-compact.zip
index f9757078c..f32e04815 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.12-compact.zip
index 8d517b8fc..94bb42f19 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.13-compact.zip
index 628f409cb..340eeeb21 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.14-compact.zip
index 34cf27caf..e0d321cbb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.15-compact.zip
index bc951a89d..96a963530 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.2-compact.zip
index 9a98c071e..4f26fc840 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.3-compact.zip
index 42776724e..df8357970 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.4-compact.zip
index dfa66a89c..b664575da 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.5-compact.zip
index 12467e2ab..a4191f6bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.6-compact.zip
index 869aad77e..7d7ebdd97 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.7-compact.zip
index 215fc1776..7bd9328d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.8-compact.zip
index c0a15e37d..47baa82f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.9-compact.zip
index 2aaafde0e..a8719598d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/functioncall-0.8.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.0-legacy.zip
index 3f310b0ba..92f5d744e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.1-legacy.zip
index 618d59779..17a154550 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.10-legacy.zip
index e420651d7..df10488da 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.11-legacy.zip
index e7f96c073..20dfb074d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.12-compact.zip
index f58127a1c..e6a9d7c7d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.12-legacy.zip
index 687d720be..cf06e0917 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.13-compact.zip
index d8a9a6c1a..71136034a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.13-legacy.zip
index 1ff797ce4..2c93db59e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.14-compact.zip
index 3a96c32f0..cfa196df2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.14-legacy.zip
index f989aeba4..ad459345c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.15-compact.zip
index ee9377e6c..fb017ac2c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.15-legacy.zip
index 6f6429774..e7bb836eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.16-compact.zip
index c0b78a701..026f381ea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.16-legacy.zip
index a8ce8a3ba..e7d96ee70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.17-compact.zip
index 56c754118..41ebaad8b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.17-legacy.zip
index daf10347b..7ff95040e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.18-compact.zip
index f803d6b1f..7226e573e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.18-legacy.zip
index 86025b973..f616f990b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.19-compact.zip
index e25046057..251cc7fa7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.19-legacy.zip
index 3680af476..01348e52d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.2-legacy.zip
index 9e29e0b81..38727d5c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.20-compact.zip
index 9a8c29231..01179c0d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.20-legacy.zip
index 4ea3a1746..fd58cda8e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.21-compact.zip
index c3c2d5f3f..2f7c7115e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.21-legacy.zip
index 6221aaeea..822e76d09 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.22-compact.zip
index 03c4dcc40..87ab44af2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.22-legacy.zip
index 4ffe9f4c9..3635086a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.23-compact.zip
index 4b935628b..51b6f3c28 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.23-legacy.zip
index 919ac2e43..26568ffb2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.24-compact.zip
index 94c8f4f0e..25b3b083f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.24-legacy.zip
index 934dcc2d4..3aa3b5120 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.25-compact.zip
index a9df95cbe..d530800ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.25-legacy.zip
index 3aabb73bd..3416ddb5d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.26-compact.zip
index 8c93f53ac..79174311d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.26-legacy.zip
index 5e9dc2006..0e83cdd59 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.3-legacy.zip
index 8141187f0..0182083db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.4-legacy.zip
index b0c84d1b8..a09efbae9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.5-legacy.zip
index bd2e3553b..8ef542af9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.6-legacy.zip
index 059206ff0..a103be7d6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.7-legacy.zip
index c64ab6996..d7a0fa80d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.8-legacy.zip
index f51c96372..9d2ca6571 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.9-legacy.zip
index f7aea0c2b..ba61ff80c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.0-compact.zip
index cf296c87b..1298bd792 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.0-legacy.zip
index 04defec4c..2db4598fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.1-compact.zip
index f212dd199..8e4dfdd8c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.1-legacy.zip
index 2b9ef6145..99dcef789 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.10-compact.zip
index 9d5c11362..adf7c0793 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.10-legacy.zip
index 4a24f4271..a43f6e806 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.11-compact.zip
index d73d0174b..e4d8df1ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.11-legacy.zip
index 1e9ffd95d..6b7471dd9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.12-compact.zip
index 0ecc64d2b..b48347e7c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.12-legacy.zip
index 1b3573d9d..37ac3afaa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.13-compact.zip
index c324e2e4b..9cf3b0e32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.13-legacy.zip
index 4066b19e8..4917c50dc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.14-compact.zip
index 91f99f27b..5067c58f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.14-legacy.zip
index e1f201769..c4004bee2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.15-compact.zip
index 53af68014..c5229590e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.15-legacy.zip
index 2cd89876c..b1c8cfc4f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.16-compact.zip
index dc1daf9dc..fc8d9088c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.16-legacy.zip
index 7d8067c61..177a61212 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.17-compact.zip
index 19e6cd2be..b3c396e6b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.17-legacy.zip
index 2e4c1b875..64ed81099 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.2-compact.zip
index 06d2189b1..ee79530fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.2-legacy.zip
index 528763f00..d108f3fa5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.3-compact.zip
index bd7672c58..181cf9e7c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.3-legacy.zip
index 6a3b5a94a..d08d55d57 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.4-compact.zip
index e3be5568a..d1408212b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.4-legacy.zip
index bfe1eb53f..a91141794 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.5-compact.zip
index 7a9ec7765..d87782cc6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.5-legacy.zip
index 3520d83db..6b5f464f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.6-compact.zip
index f5e541b9b..1bef382ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.6-legacy.zip
index 5f4cafefd..af6cea643 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.7-compact.zip
index 01e8693d6..a92b634d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.7-legacy.zip
index 10d55d343..9f9afb1ad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.8-compact.zip
index ff5697444..69b295610 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.8-legacy.zip
index 5808bbf89..26e129ea8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.9-compact.zip
index fbee9d64f..187c31d00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.9-legacy.zip
index 68a5ef6dc..dab42024d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.0-compact.zip
index 25ac51965..1d68999f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.0-legacy.zip
index d7bf95ede..7a249ba3d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.1-compact.zip
index 93c054f67..59aa6e8e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.1-legacy.zip
index a01b99012..fd9698af1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.10-compact.zip
index 7a4177828..e4faf67f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.10-legacy.zip
index aa95ff7e2..bf15b5be9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.11-compact.zip
index 98d4ee4f4..184a7abc9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.11-legacy.zip
index 468d7ddb8..f623eb1a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.12-compact.zip
index 4a23b7a5a..896223109 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.12-legacy.zip
index ff58f3a59..3ba68eb69 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.2-compact.zip
index 1f9a68a7e..020449de6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.2-legacy.zip
index 9c8666aee..e1d50850d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.3-compact.zip
index 8c840f69e..9e082c84c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.3-legacy.zip
index cdd81eec7..c6ddaef70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.4-compact.zip
index c5b1cb4fa..4a68c7550 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.4-legacy.zip
index 39055aab1..5623bf0a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.5-compact.zip
index b1bba1f8a..4ce2748fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.5-legacy.zip
index 3149b6f78..4924aae45 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.6-compact.zip
index 9f903cf8c..b05904459 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.6-legacy.zip
index ed97d98c6..baf218910 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.7-compact.zip
index 91b8a158f..97525cf7c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.7-legacy.zip
index 174ec2c0d..d20c41a44 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.8-compact.zip
index f354e5271..ea2bc1562 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.8-legacy.zip
index 6a856fc1a..3be7b5110 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.9-compact.zip
index bcf95a0bd..b269a2dcf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.9-legacy.zip
index c268d5516..e134ffaee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.0-compact.zip
index 62293bc0f..4a2aca3c8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.0-legacy.zip
index 8e0542887..92eac364f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.1-compact.zip
index 7b410d7f9..6f0370a4b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.1-legacy.zip
index 6af92e918..bbd25cf6a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.2-compact.zip
index c77edc38c..c59d78b94 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.2-legacy.zip
index c067f27d9..6ba75f6d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.3-compact.zip
index 4df1ac26e..b968263e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.3-legacy.zip
index 2b94c8e86..9c0f9b18c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.4-compact.zip
index aa2524e1f..24d06bd92 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.4-legacy.zip
index 445d22972..e22b8c6f2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.5-compact.zip
index 21a011ad7..92cadb6bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.5-legacy.zip
index ab9baf1bd..b68f32147 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.6-compact.zip
index 7907a5c27..a5e13734c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.6-legacy.zip
index c61267a60..4b87b2698 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.0-compact.zip
index fdb9e32ad..dff888f96 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.1-compact.zip
index 5f17d7bea..77c5c9677 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.10-compact.zip
index 0fb4c7d32..1efc00e9f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.11-compact.zip
index dc898ec32..cdc99a4fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.12-compact.zip
index 78952305b..9156e91ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.13-compact.zip
index 309ebec22..96170dbf0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.14-compact.zip
index 184f82753..cef5d6ff4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.15-compact.zip
index 1851aff07..a6ca05bcc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.2-compact.zip
index 8905fa379..e894bb9ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.3-compact.zip
index e85da437d..98b10b9a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.4-compact.zip
index 4ccecc1d5..397b37cab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.5-compact.zip
index 095be6c87..dfa6a09c3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.6-compact.zip
index 1cf0ee0a9..9f5995030 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.7-compact.zip
index 7710213e1..5515f83a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.8-compact.zip
index 79f3672ef..2eb5dfdb0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.9-compact.zip
index 0e9927df2..458c7e5ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/if-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.0-legacy.zip
index c3df8f197..1ce0afa3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.1-legacy.zip
index 2ac5ca0a2..5b0ce717d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.10-legacy.zip
index a2c2a6858..03d82c256 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.11-legacy.zip
index e18a558f7..57de8d92e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.12-compact.zip
index 0a4d7bd38..c5604e5bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.12-legacy.zip
index 80f829632..9be3841df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.13-compact.zip
index 347b8dd7d..82f22ce99 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.13-legacy.zip
index e0e108708..e9b4a45c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.14-compact.zip
index 994ac998f..3e4ec5e36 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.14-legacy.zip
index 62a31d20c..3c0c0b549 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.15-compact.zip
index 510072a7d..d97dd1b8c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.15-legacy.zip
index 98312fa5d..3f9fba378 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.16-compact.zip
index 5a3db9ec7..008e1bf98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.16-legacy.zip
index 4535b581f..499af3595 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.17-compact.zip
index 48973f63a..e94e10442 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.17-legacy.zip
index 65635df59..8694ddbd5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.18-compact.zip
index caf57b243..da5e7a000 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.18-legacy.zip
index cae0394bf..eefbb26f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.19-compact.zip
index aa7e56aeb..d26d8bffe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.19-legacy.zip
index 2b3323aac..62b51387f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.2-legacy.zip
index 4208634f0..87a01dc00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.20-compact.zip
index 901c61725..66667c0a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.20-legacy.zip
index c7b66857f..e4d321325 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.21-compact.zip
index ce3ed6efa..0aa20c2ad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.21-legacy.zip
index 23187988e..dbc2df1d6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.22-compact.zip
index 5d4a983cb..3c2bc8472 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.22-legacy.zip
index 5a8a7821a..5059cfd91 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.23-compact.zip
index 192b2bac5..ab1b7d7b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.23-legacy.zip
index 866a9fcf3..bf8c61eb7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.24-compact.zip
index 94cac31b1..2b01ab5ed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.24-legacy.zip
index 92436c79a..b191a9a4a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.25-compact.zip
index ab67e7ce9..2fe7f92c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.25-legacy.zip
index 91ab19861..e03b2600d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.26-compact.zip
index 0494ff54c..17cb4b874 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.26-legacy.zip
index c9d824e80..a613dd32a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.3-legacy.zip
index 615d64e9c..516caa46c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.4-legacy.zip
index 7260f8578..407416f99 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.5-legacy.zip
index 09a35b921..e1838bc0e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.6-legacy.zip
index fa073ae80..bc9381a7e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.7-legacy.zip
index f476b2dbc..668c1e02b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.8-legacy.zip
index 310a193fb..151d8d658 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.9-legacy.zip
index 9a9c5ed1c..308f09a2e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.0-compact.zip
index dc3878ebb..d693ffb16 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.0-legacy.zip
index 410df3d2f..77470d52d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.1-compact.zip
index fdac6bf1a..72a9c882d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.1-legacy.zip
index 944ca67c6..b174b09a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.10-compact.zip
index c521fd994..a21a4115d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.10-legacy.zip
index d3636ca34..7a6f19a49 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.11-compact.zip
index 9b5fe9e98..9e00489b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.11-legacy.zip
index 24cc01860..664aa5e4a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.12-compact.zip
index 7df512bb7..43cc9d7b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.12-legacy.zip
index a89a77912..d483f6056 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.13-compact.zip
index a8307ace8..4d59d6ca3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.13-legacy.zip
index 083582038..3537f74bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.14-compact.zip
index 5d2ee3b20..ab9cbbd55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.14-legacy.zip
index 6797862c6..3e1d86a66 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.15-compact.zip
index 582870c73..0ca93a552 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.15-legacy.zip
index 853a9a530..40b481720 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.16-compact.zip
index 2568bc67f..e6744a3c3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.16-legacy.zip
index bbf60d8cb..4f0153ca2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.17-compact.zip
index c2f36b58d..fa858f890 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.17-legacy.zip
index 8ffe7069b..9e10dce03 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.2-compact.zip
index 41e8db5b9..ccff9b3a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.2-legacy.zip
index d20822074..55aca515f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.3-compact.zip
index 9c0bc3dc6..117554721 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.3-legacy.zip
index ac7bf2232..c1cd959cc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.4-compact.zip
index 077d8b013..61578dd81 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.4-legacy.zip
index dd9c284f1..1d484d27b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.5-compact.zip
index f791795a0..80adbc03c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.5-legacy.zip
index fbf01c5f3..39c93d453 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.6-compact.zip
index 6a705f228..e174c620e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.6-legacy.zip
index d4469f4fc..bc1c3bffa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.7-compact.zip
index f9f014416..52e23ea18 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.7-legacy.zip
index 9d5bf7a45..b48f7b812 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.8-compact.zip
index a584fa1aa..9433529ea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.8-legacy.zip
index c7f24723f..0cf66f1db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.9-compact.zip
index 844d7a980..afd9439b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.9-legacy.zip
index 1b1c291f5..00c61fb2d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.0-compact.zip
index 5975410fb..3be23f162 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.0-legacy.zip
index 143b82b70..8dd6b838a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.1-compact.zip
index 8d2578429..2cbd6b43d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.1-legacy.zip
index 09df375c7..dea63e38a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.10-compact.zip
index 33b0b8100..359ac6279 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.10-legacy.zip
index 5ca086c33..8b9bdfa37 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.11-compact.zip
index 9482ec67d..0fbc27c8d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.11-legacy.zip
index 95914b09b..eb248d2f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.12-compact.zip
index 8a7075200..9920d1735 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.12-legacy.zip
index c1615b877..9fce97f87 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.2-compact.zip
index 4641700cd..c169cc6d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.2-legacy.zip
index 689784b87..844d6f9cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.3-compact.zip
index 9d5d0d552..41be14edf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.3-legacy.zip
index e27525633..be10eb4ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.4-compact.zip
index 732a62a60..a1db767d8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.4-legacy.zip
index 727e879df..339e947b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.5-compact.zip
index b4f2757f4..c6d50ba7a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.5-legacy.zip
index 223e3242d..0385e41ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.6-compact.zip
index ed8044462..9dc5458a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.6-legacy.zip
index 8e4416535..37e6d80d8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.7-compact.zip
index 39e415fa8..be84c0fb4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.7-legacy.zip
index 94c6a3547..ae43b8f87 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.8-compact.zip
index b68ea3bc0..934330e4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.8-legacy.zip
index 6136c365d..f2ede67e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.9-compact.zip
index 94cc7591f..f382046b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.9-legacy.zip
index bc5ed735e..baf2e55cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.0-compact.zip
index 5665945f4..871894912 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.0-legacy.zip
index 3b50ac20e..1b211a8e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.1-compact.zip
index a1e6402c0..5208fc265 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.1-legacy.zip
index 523542e02..56b70fb27 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.2-compact.zip
index 4ac1f0542..71e6577f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.2-legacy.zip
index 45f88daca..234853cba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.3-compact.zip
index ded8bdd25..57e3ad4e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.3-legacy.zip
index d3ec4c795..a633f6c9b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.4-compact.zip
index 28260cd0f..eeb7ef9f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.4-legacy.zip
index 8aa4ac6ff..3674b04df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.5-compact.zip
index dbba9ef9d..bda64ab94 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.5-legacy.zip
index 6d48adb31..9bab457cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.4.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.7.6-compact.zip
index f49c9f81c..6705b8745 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.7.6-legacy.zip
index 7f4d44215..22e0b351b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.0-compact.zip
index c868f6042..7d6a6e4de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.1-compact.zip
index bf8ff9516..270a45802 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.10-compact.zip
index 090e45087..4d6ca184d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.11-compact.zip
index c1dfb34db..d2112853e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.12-compact.zip
index 577b6a567..bce60d146 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.13-compact.zip
index 2a75f5def..54eff2433 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.14-compact.zip
index 9a4b41040..c3daf2801 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.15-compact.zip
index 0f89b6922..17848bffa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.2-compact.zip
index f04965f1c..77b57ec74 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.3-compact.zip
index 7a343efdc..1cf816ae3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.4-compact.zip
index d326d2105..9245a38d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.5-compact.zip
index 3c9731a08..994e6a4a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.6-compact.zip
index e7fd85215..7e2a7c8cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.7-compact.zip
index f57d79fd3..f28a4149d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.8-compact.zip
index 56354068c..53c98fa2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.9-compact.zip
index 6570b4dd6..df36eba6a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/import_interface_with_struct_from_top_level-0.7.6.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.0-legacy.zip
index 673a80c3e..a13e6d1b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.1-legacy.zip
index e2fbf5bfe..0063cd1c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.10-legacy.zip
index 210565e99..0683cee8a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.11-legacy.zip
index 6ba988580..2a631c21d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.12-compact.zip
index 14b141b36..7f3a77de8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.12-legacy.zip
index 049ca5830..a4467a1e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.13-compact.zip
index 75d931a54..f020d4c38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.13-legacy.zip
index 82f7ec36a..93be8d8d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.14-compact.zip
index c5d7bdde1..32e6da43c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.14-legacy.zip
index 98bdc280a..e8fbbbe05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.15-compact.zip
index 2181d0c3f..cd46ceb1b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.15-legacy.zip
index 826dd53e7..3311ff2cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.16-compact.zip
index a5865b30e..68dd52f71 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.16-legacy.zip
index 1ac2e9e8d..788b1024c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.17-compact.zip
index bb7b5f10a..a1202f6e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.17-legacy.zip
index 2070e5d82..87d051400 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.18-compact.zip
index 82bc7fafc..ef466955c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.18-legacy.zip
index 141016f45..ee2240484 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.19-compact.zip
index d6b8cb4de..e13e51e5b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.19-legacy.zip
index 36b03e4c2..e73c3defc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.2-legacy.zip
index 06c3e7d6a..184b3a8e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.20-compact.zip
index f9ef451c2..58582e660 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.20-legacy.zip
index 1a03f7b2c..1fb78c59c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.21-compact.zip
index 9d2b34ffd..f0effda56 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.21-legacy.zip
index 9d53e0805..88abc98f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.22-compact.zip
index 123094d9b..13ecd7de0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.22-legacy.zip
index 5d180775d..45fffc7cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.23-compact.zip
index 4796d7aa6..eb1482c7e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.23-legacy.zip
index 624f71126..40da3b03e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.24-compact.zip
index f74b0df8b..483b3031e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.24-legacy.zip
index 399c160e4..5971b6c18 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.25-compact.zip
index 49adc6e12..065fd5b86 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.25-legacy.zip
index 19b22acee..8a7640eb5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.26-compact.zip
index beee4c4d8..5d7ad1f50 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.26-legacy.zip
index fa8c41811..37b2f4eea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.3-legacy.zip
index 08190dece..a2738552e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.4-legacy.zip
index 400d19022..0178f0161 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.5-legacy.zip
index 08e0e13bd..597c0813d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.6-legacy.zip
index bb1c205ca..6f77470a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.7-legacy.zip
index 9013c0c0a..0ed22975e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.8-legacy.zip
index f6b6068b7..9408bec34 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.9-legacy.zip
index 1981b82f6..1216acdca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.0-compact.zip
index b726e0460..997042569 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.0-legacy.zip
index e9673b5b5..3bd87c098 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.1-compact.zip
index a00737cd6..284d439d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.1-legacy.zip
index 49485a0a5..f2d0d9b3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.10-compact.zip
index f0aefd22e..dc1bace3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.10-legacy.zip
index f5a881bf0..21be8dab1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.11-compact.zip
index baba351b6..a7d65a8be 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.11-legacy.zip
index ec562377d..14c96a728 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.12-compact.zip
index d93dc1dde..6477a6340 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.12-legacy.zip
index 165f311b3..0fafea2e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.13-compact.zip
index 1ade60cd7..71b040aac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.13-legacy.zip
index a0135c376..a0eae1d1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.14-compact.zip
index ce1665704..fa9ed6d2c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.14-legacy.zip
index 7988a7194..0adc19ade 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.15-compact.zip
index 39375efb3..a70340dc0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.15-legacy.zip
index 14d6d2caa..5a032c68b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.16-compact.zip
index f8febfac7..a444ff076 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.16-legacy.zip
index 54119accb..24a9cc19a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.17-compact.zip
index aaf3e655a..428b9c929 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.17-legacy.zip
index 9bc41926c..142c1cc8d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.2-compact.zip
index c752fdf8c..6da76a18d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.2-legacy.zip
index 7a7f55976..05e63619a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.3-compact.zip
index 57fa30707..ba0ce3f12 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.3-legacy.zip
index b911bef9a..0fdb301fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.4-compact.zip
index c56bd13d9..13fa93899 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.4-legacy.zip
index 145eacbfa..629364920 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.5-compact.zip
index 20ed6b77c..e89e62e9a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.5-legacy.zip
index a39880ab7..b76bb1ee1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.6-compact.zip
index 2bd1b3aeb..52cc050ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.6-legacy.zip
index 07fe7a6f3..b1bfbd56c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.7-compact.zip
index 01a396957..c801e4871 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.7-legacy.zip
index 42eb24de6..0f6eda318 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.8-compact.zip
index f80bbfe8a..99fa3c4a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.8-legacy.zip
index 94ddb0c6a..c17535bb0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.9-compact.zip
index 76a63679e..557640d15 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.9-legacy.zip
index f400c7cb5..a1ce67081 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.0-compact.zip
index a3ae68eac..44e838de4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.0-legacy.zip
index ffd075f8c..e10d81845 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.1-compact.zip
index c32640402..59fc6a825 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.1-legacy.zip
index 05d7156ba..7ae3db476 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.10-compact.zip
index 9ca73521f..28f4a9c24 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.10-legacy.zip
index 8cec48961..b231c71fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.11-compact.zip
index d4eabaf3e..33ae1e8b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.11-legacy.zip
index e11501e0c..4f53cc033 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.12-compact.zip
index bbd18a1d6..052309259 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.12-legacy.zip
index 54d7ec519..fa9337470 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.2-compact.zip
index b5d9d803d..616ab4715 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.2-legacy.zip
index 24e352abd..c58d02023 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.3-compact.zip
index fae69a990..8f01c6241 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.3-legacy.zip
index 2ef4c5961..b3a16f52d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.4-compact.zip
index bbadf9321..50ba5760a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.4-legacy.zip
index e80c38803..f28441294 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.5-compact.zip
index d577b309e..65fc9c4a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.5-legacy.zip
index e1d5de199..c2cb726e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.6-compact.zip
index 4edf192f9..6208cdbc8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.6-legacy.zip
index db3723923..e6f26f95d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.7-compact.zip
index c9dbcb7ab..a89723073 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.7-legacy.zip
index b5e07e848..9c71486fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.8-compact.zip
index 69a095f8e..2d5053cf7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.8-legacy.zip
index ec6066757..7bb9ecb3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.9-compact.zip
index 1dc08b1e4..7a0ee9da1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.9-legacy.zip
index d613222df..3ede80f55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.0-compact.zip
index b0082d6b5..b916f79fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.0-legacy.zip
index 6fe54ef92..03577dcec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.1-compact.zip
index cf0dfbcbd..65ad0be37 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.1-legacy.zip
index 0be330e8a..e3f2ce7d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.2-compact.zip
index d1e531f1e..9d0e22d7d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.2-legacy.zip
index 30dd19ac3..c91a7d120 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.3-compact.zip
index 0866dd84c..5fe7bad1e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.3-legacy.zip
index 1a10bce20..adb11f66b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.4-compact.zip
index 318008a7f..c1c12f57a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.4-legacy.zip
index 62604fbce..61efe1cae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.5-compact.zip
index 9412c7b94..85ff59430 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.5-legacy.zip
index 3c4152cec..13743440e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.6-compact.zip
index 121ead5cf..a7a303630 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.6-legacy.zip
index e401f281b..083805b30 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.0-compact.zip
index 5f612e1c3..69172be0b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.1-compact.zip
index d5b6f766b..c86c212bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.10-compact.zip
index 4bf7709b8..eb4594175 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.11-compact.zip
index ebd063c4e..701441e16 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.12-compact.zip
index 85b42ce42..94d475296 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.13-compact.zip
index 0f1e4e6be..35f49da37 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.14-compact.zip
index c4d10cccf..d63c48f78 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.15-compact.zip
index baca125cf..77ad66432 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.2-compact.zip
index 47cfe2cf2..427faa381 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.3-compact.zip
index 6b9957411..d66a61c22 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.4-compact.zip
index 7ab83e3af..254487fc5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.5-compact.zip
index 91199e53d..50f63e2e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.6-compact.zip
index a158cf03c..387a16ca3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.7-compact.zip
index 58279e747..719ca98c3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.8-compact.zip
index 53e9dfea8..7d087963e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.9-compact.zip
index 37397b5e1..11cf3c8c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexaccess-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.0-legacy.zip
index 417b0f3bf..a97a6d934 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.1-legacy.zip
index fb04469bf..7bc8243ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.10-legacy.zip
index 7285eb78b..407bf5281 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.11-legacy.zip
index 63883a0bb..abb7b49e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.12-compact.zip
index 745e62e60..ad17c47bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.12-legacy.zip
index 62b2fba20..1336699af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.13-compact.zip
index 5a228c089..100080297 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.13-legacy.zip
index 0d756ec07..f17ecf562 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.14-compact.zip
index 4c57101bb..83c12afff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.14-legacy.zip
index fbdd8bce9..ade5f4df4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.15-compact.zip
index 9df39de8e..99483be1c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.15-legacy.zip
index 8354a298d..4a2f9a53b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.16-compact.zip
index dff4cc0bc..0fdd19421 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.16-legacy.zip
index afb30e177..ddb3f0488 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.17-compact.zip
index 874ec950b..946c7809c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.17-legacy.zip
index 762d03d9c..ef198f242 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.18-compact.zip
index c0e226926..8c99c303a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.18-legacy.zip
index 405f3353b..e9cef0194 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.19-compact.zip
index 3efd4150b..0a9750d00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.19-legacy.zip
index a33de9792..f78a6aacd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.2-legacy.zip
index b2bffb0f6..e2a7b4ddb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.20-compact.zip
index 62aad6a57..7f5281849 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.20-legacy.zip
index 2bc72cca0..65f72e6b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.21-compact.zip
index 5c9b7158d..ab0513329 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.21-legacy.zip
index 2e5dcc439..a4938cad5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.22-compact.zip
index f5eee9490..5efb54b55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.22-legacy.zip
index 0805cd20a..db8824727 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.23-compact.zip
index 17aaa0c6f..63a20d1b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.23-legacy.zip
index 2932f7803..20e88c913 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.24-compact.zip
index 9798ff63c..2913393be 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.24-legacy.zip
index 4313e2d80..dd23021ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.25-compact.zip
index 147ee4485..9b0dcfeea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.25-legacy.zip
index 1fd2a355f..e611bfcfb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.26-compact.zip
index 1a66c340e..450434f88 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.26-legacy.zip
index b84d8a64e..31a29bbd8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.3-legacy.zip
index b806a08de..b7bc8d88d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.4-legacy.zip
index 21e38a34b..2211777c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.5-legacy.zip
index d51f057d2..90f4a7ba5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.6-legacy.zip
index 245b98dd2..8a23fc2c8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.7-legacy.zip
index 28ff7bdf9..8b5c4794e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.8-legacy.zip
index f30cc314b..ae9521499 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.9-legacy.zip
index 33e3872ed..24b101cd0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.0-compact.zip
index f04751ba9..164a332fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.0-legacy.zip
index 08dec1ffb..e17dadf65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.1-compact.zip
index 1f8cac8b4..61b41095b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.1-legacy.zip
index a56b79362..98e6b6dc2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.10-compact.zip
index bbf641227..6655ef4ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.10-legacy.zip
index 4ba657ff0..b67200645 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.11-compact.zip
index 086b822ce..991e9aefa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.11-legacy.zip
index 231f0fd3c..892de7309 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.12-compact.zip
index 47fd63bd9..05be682cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.12-legacy.zip
index de3050876..b3625b2b2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.13-compact.zip
index 3b378f7c3..6a6ac8a46 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.13-legacy.zip
index 5c2020c6c..937f53ac5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.14-compact.zip
index 57d88dca6..51d8d6937 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.14-legacy.zip
index 29bce3504..dcce98078 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.15-compact.zip
index 691145a86..f57f458d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.15-legacy.zip
index 70aec6ea2..d689bac2a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.16-compact.zip
index f883089c5..f1e65104d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.16-legacy.zip
index bb7c36d30..6be4cdcb1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.17-compact.zip
index b6ded0210..4b265ede3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.17-legacy.zip
index 568815d94..a98044d8d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.2-compact.zip
index ec066540f..3c94ab9b7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.2-legacy.zip
index f5d1a6a8f..215be1c6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.3-compact.zip
index d66b66078..fac96ad92 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.3-legacy.zip
index 000f2276b..185d95042 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.4-compact.zip
index 125bd662d..0aad9f366 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.4-legacy.zip
index bf09976e8..71a1beb77 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.5-compact.zip
index 04aede019..cd9028f40 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.5-legacy.zip
index 4edc73103..d4ae8c578 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.6-compact.zip
index 3e6f99fc5..15240d7f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.6-legacy.zip
index 6aab84517..cf472199a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.7-compact.zip
index a99113408..a453b8987 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.7-legacy.zip
index 8f29d4236..e3a936279 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.8-compact.zip
index 5d54e6400..cb98a4a40 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.8-legacy.zip
index 47861254b..9fc401cee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.9-compact.zip
index 15f42dfcb..a8ad3f319 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.9-legacy.zip
index 088a45e4c..490d3e687 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.6.0-compact.zip
index cbe9104e0..add88a80a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.6.0-legacy.zip
index 168916c20..173082781 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.4.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.1-compact.zip
index 161986792..c9801034e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.10-compact.zip
index 62e5e32f1..412f1e24d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.11-compact.zip
index 3a8c2cec5..74cb8c7f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.12-compact.zip
index b51532556..ef9326c72 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.2-compact.zip
index cc4a02479..d8147ab3e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.3-compact.zip
index 77c22fb44..c26a0f969 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.4-compact.zip
index c81628ecc..e47db0017 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.5-compact.zip
index 540dd6c43..7ab73d439 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.6-compact.zip
index 29205de39..04a807548 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.7-compact.zip
index d5d483e45..1fe1e1362 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.8-compact.zip
index 868fa2ddb..2f02d8123 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.9-compact.zip
index 36e51b8dd..7d8131548 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.0-compact.zip
index 9f0bb730f..1ae8f14d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.1-compact.zip
index 371b2a6c0..1d585e574 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.2-compact.zip
index d2adf38ea..0110c9b78 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.3-compact.zip
index b8ea5f9a9..7c59de404 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.4-compact.zip
index 22895e094..88cf7e008 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.5-compact.zip
index 3b7d89f8d..e403422c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.6-compact.zip
index 1fc650ab2..f993e7ed9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.0-compact.zip
index b80de9839..309a561f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.1-compact.zip
index ad9e9da1f..bcb7f8228 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.10-compact.zip
index d4b5e59b6..daca9c3c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.11-compact.zip
index a3e830b4d..da912aa47 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.12-compact.zip
index b006182c5..69c8c8907 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.13-compact.zip
index 6ffaad923..501c3b225 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.14-compact.zip
index 5d81df8d1..a9be7214c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.15-compact.zip
index f96cc28d8..c5de6d4fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.2-compact.zip
index 06210241e..cc19fc854 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.3-compact.zip
index 07f3521ae..3767cef14 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.4-compact.zip
index f9d121e29..acece8c46 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.5-compact.zip
index fedf7d000..f7c5ca50d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.6-compact.zip
index a59589eda..3d566db38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.7-compact.zip
index 4ea40f1c0..b5f772dfe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.8-compact.zip
index c8a3d43f1..a099fc445 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.9-compact.zip
index f1774b405..68cd54e2f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/indexrangeaccess-0.6.1.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_event-0.8.16.sol-0.8.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_event-0.8.16.sol-0.8.16-compact.zip
index 830c0e4e8..7a6584ace 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_event-0.8.16.sol-0.8.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_event-0.8.16.sol-0.8.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.0-legacy.zip
index 9932a3c0c..afd46dfb8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.1-legacy.zip
index caad5f945..108eadf7d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.10-legacy.zip
index 57d688f57..da3044c79 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.11-legacy.zip
index cde91509d..c72d1b296 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.12-compact.zip
index 5f940c825..88edb59f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.12-legacy.zip
index 8b60c4b0a..59891c887 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.13-compact.zip
index ed6bede7f..583be6be0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.13-legacy.zip
index d2fd85fc1..c394fb237 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.14-compact.zip
index aedd9bb91..eb16f7a44 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.14-legacy.zip
index e88c71f25..f264458aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.15-compact.zip
index 3174ae5bf..b95a76cda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.15-legacy.zip
index 485968152..3f5d724a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.16-compact.zip
index 7809e6015..da257b9e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.16-legacy.zip
index d73435f40..4d3debc4a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.17-compact.zip
index e62686709..80cd97f61 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.17-legacy.zip
index af8afa5c4..c9f2d4883 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.18-compact.zip
index 0cbc1c49d..82d7a9e1d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.18-legacy.zip
index 761aa33db..3f067b374 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.19-compact.zip
index 391ca128f..f82df233f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.19-legacy.zip
index 5f8fa6ec3..23d40971f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.2-legacy.zip
index 2bbfddfed..ebff330d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.20-compact.zip
index dcd008d10..0ff1e27a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.20-legacy.zip
index da6e3498c..f5b4e84ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.21-compact.zip
index 039f03674..883ad5456 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.21-legacy.zip
index 212044c7f..f83142142 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.22-compact.zip
index e9b0d391f..fb316cb88 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.22-legacy.zip
index 5c6a9b0b9..61575515f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.23-compact.zip
index 1d9fb609f..7066f0394 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.23-legacy.zip
index c5b69683e..85a3b5428 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.24-compact.zip
index 83ba24116..82b7382ad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.24-legacy.zip
index b1945ac02..cb4a38984 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.25-compact.zip
index 6397fcfc5..04a79456c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.25-legacy.zip
index 583850fac..01303db9b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.26-compact.zip
index 594b65621..4f82af1e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.26-legacy.zip
index 605c6b2ca..2bc06e7cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.3-legacy.zip
index afbf8a78f..53c348527 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.4-legacy.zip
index 42a465899..970144970 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.5-legacy.zip
index f19c27ba4..5e63b87ea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.6-legacy.zip
index 3b0ebcb07..80d04036b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.7-legacy.zip
index 6c6e99cbb..4e94d244c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.8-legacy.zip
index a59ad658c..19a705c55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.9-legacy.zip
index 2ee7cc133..707ef2c0c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.0-compact.zip
index 97c5c1e29..6c9cfbb80 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.0-legacy.zip
index 347e88237..a48cc7cf5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.1-compact.zip
index 786974993..0f816a88d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.1-legacy.zip
index f2138f061..7e7fd2ca3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.10-compact.zip
index 5174a432a..d66f3d0b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.10-legacy.zip
index 889b3f724..77c2ff878 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.11-compact.zip
index 6c0a1ef7f..61dfd3f53 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.11-legacy.zip
index 58a362fd4..1cb42a647 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.12-compact.zip
index 556356c4d..8e4b8aa05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.12-legacy.zip
index acd0c46f3..87aa4ff60 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.13-compact.zip
index 966a25fdc..eb0893d00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.13-legacy.zip
index dd9b92617..e2c08e6d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.14-compact.zip
index 957302ee0..f4825bec0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.14-legacy.zip
index 4bea833d6..e978b94f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.15-compact.zip
index df7e04890..651d8800c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.15-legacy.zip
index c02ba9762..1437a0bbc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.16-compact.zip
index cf5cdee80..89d5c9aaa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.16-legacy.zip
index 2e3ae8a1e..092bbafed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.17-compact.zip
index d44a98f4c..32271d275 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.17-legacy.zip
index cfd44c608..bc03af6e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.2-compact.zip
index 0233f7a7c..40ca5cca0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.2-legacy.zip
index aede59e1f..0a223198e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.3-compact.zip
index b53737410..01e346425 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.3-legacy.zip
index 8a45bbd43..1064e9706 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.4-compact.zip
index 288137f7b..46f280c3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.4-legacy.zip
index bd236562f..1e9501fb1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.5-compact.zip
index ed188f13a..d2945f0cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.5-legacy.zip
index 6d112edc3..8c523d901 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.6-compact.zip
index f249abc07..73672b0f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.6-legacy.zip
index b3f6b7730..aa932e938 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.7-compact.zip
index 81f5a6e02..cd4598572 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.7-legacy.zip
index 6f0acdd74..44bb72c6a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.8-compact.zip
index 41d8866f5..60e3d230c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.8-legacy.zip
index 184a48ef1..3589bb4fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.9-compact.zip
index bc52b4303..b9e49113d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.9-legacy.zip
index 033c642b2..8f7a900fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.0-compact.zip
index b765cb68d..2db949d41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.0-legacy.zip
index d2cdb5c23..aa097f096 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.1-compact.zip
index a8e4d6c93..baa1cc516 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.1-legacy.zip
index 796aa2022..65166d11c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.10-compact.zip
index 95d95d1b4..2e5be877b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.10-legacy.zip
index 54ffb7305..9a59a710b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.11-compact.zip
index db86dd2ab..3c3158360 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.11-legacy.zip
index 9bb26d79b..aee2b8b5f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.12-compact.zip
index 24fef41f8..9aa794ca6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.12-legacy.zip
index ff018cdba..c6a5357f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.2-compact.zip
index d172e46b2..053924766 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.2-legacy.zip
index 06378c0da..13fee0d43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.3-compact.zip
index be44fc452..3ad879169 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.3-legacy.zip
index ef5cefefe..3c454d905 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.4-compact.zip
index f31f06a19..3d7c40914 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.4-legacy.zip
index cded506d8..0f001f1a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.5-compact.zip
index b369b4b88..1909fc50f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.5-legacy.zip
index d07b4ab5c..fe7423ceb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.6-compact.zip
index 27a24fbae..0e54ed5a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.6-legacy.zip
index aceb2ee92..d9afcfa62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.7-compact.zip
index 9ca09fb7c..d76526479 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.7-legacy.zip
index 14584b937..1de6ce883 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.8-compact.zip
index c97581b12..1afde994f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.8-legacy.zip
index 364525964..8a1fcac2d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.9-compact.zip
index 350a4febd..8226b3d19 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.9-legacy.zip
index 1962ff47a..522bca236 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.0-compact.zip
index df7d561db..cfab5e967 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.0-legacy.zip
index 9a10da037..3e750d703 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.1-compact.zip
index 863d7f543..0328d24df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.1-legacy.zip
index 767c6da24..ee6c7914c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.2-compact.zip
index f2f5567b8..4af171f0b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.2-legacy.zip
index 8116eb4ee..0218c7dce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.3-compact.zip
index 779650ee7..ef9a717f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.3-legacy.zip
index 8321dd080..285c15624 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.4-compact.zip
index c239f7ed3..275dd7462 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.4-legacy.zip
index 580b1d9c2..592ad1ad0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.5-compact.zip
index 178f0054d..adeb96c37 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.5-legacy.zip
index 3b0bf87f2..274e5436c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.6-compact.zip
index 008c3d4d4..cd978bd12 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.6-legacy.zip
index 3e26391d9..65fc76b6b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.0-compact.zip
index 9fb4554cf..1992f1261 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.1-compact.zip
index f2997b785..d6a1c64e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.10-compact.zip
index 7aa03067c..afe64ec10 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.11-compact.zip
index beb373556..8c59a1183 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.12-compact.zip
index 49e2f3ef8..7fe099ac0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.13-compact.zip
index a32f87daf..8e040e591 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.14-compact.zip
index 198deded1..baa6dc9f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.15-compact.zip
index 34a12d8c8..ccd5d7315 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.2-compact.zip
index 13e86a9cc..def1aa550 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.3-compact.zip
index b54bc35bb..e865336a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.4-compact.zip
index 782e10656..6fd462ed6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.5-compact.zip
index e5d566097..29cca441c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.6-compact.zip
index 6e67a380a..3651c1668 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.7-compact.zip
index 78a5435df..12addcf09 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.8-compact.zip
index 7c6ffc0fb..118081c36 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.9-compact.zip
index ae4dd5366..c1ac68a26 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/library_implicit_conversion-0.5.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.0-legacy.zip
index 84435f44f..bc736dd6b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.1-legacy.zip
index 08fbcc355..e1858919d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.2-legacy.zip
index 465d6dd46..0e4a04c6c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.3-legacy.zip
index 76633138e..ace7e5680 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.4-legacy.zip
index bfc430bbc..2d33622f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.5-legacy.zip
index 98c5e7e10..71059f75a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.6-legacy.zip
index e7d4b1179..3732e1800 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.7-legacy.zip
index 5fc4429d2..7957745b2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.8-legacy.zip
index 03c719710..526012930 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.9-legacy.zip
index 4ede2f404..fe4f1112a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.10-legacy.zip
index 1c9217da0..b46f65a91 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.11-legacy.zip
index 9be204381..425187c48 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.12-compact.zip
index 65715fcce..ab0295667 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.12-legacy.zip
index cd96363a4..9274adc68 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.13-compact.zip
index 3d1b4f260..7be3926d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.13-legacy.zip
index 7dd54730c..d9a0840cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.14-compact.zip
index f9dd63a2b..454fc4e99 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.14-legacy.zip
index 5c248be38..df325a23e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.15-compact.zip
index a1d00d96a..466ea64cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.15-legacy.zip
index 344664e05..0ed54ebf3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.16-compact.zip
index a046f236f..7fab3d462 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.16-legacy.zip
index 9ae74b368..d1cd7ba7c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.17-compact.zip
index 95555ff20..2fb4c02b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.17-legacy.zip
index 5811c305d..87667420a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.18-compact.zip
index 8563b71da..c0cdcc42c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.18-legacy.zip
index 3a5a0c8c2..05611ea07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.19-compact.zip
index 1fa082e06..52df9f4b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.19-legacy.zip
index 057a43ebd..f5d9ed797 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.20-compact.zip
index 09236ad27..2803333fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.20-legacy.zip
index 91161b6b4..7f9c475dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.21-compact.zip
index 7cbbe84c5..75fcc9d4f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.21-legacy.zip
index 7f88dabde..af5eb32b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.22-compact.zip
index 1d87e8460..82b24dccd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.22-legacy.zip
index 86344bc5e..5b59a1721 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.23-compact.zip
index c8e8edf9e..4fc6deca0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.23-legacy.zip
index 83696b6d2..413b83759 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.24-compact.zip
index 576ac858e..0c544f68d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.24-legacy.zip
index f0500bb2c..a499f060a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.25-compact.zip
index 9d442244f..59275df71 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.25-legacy.zip
index 1496906f0..8096daf38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.26-compact.zip
index c8b5760a7..bc968f0e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.26-legacy.zip
index 3c1f9b74d..12d01986a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.4.10.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.0-compact.zip
index 28b34b048..85feb5505 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.0-legacy.zip
index 5feed9e4b..def013ff7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.1-compact.zip
index acbccaf1f..c7be4554a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.1-legacy.zip
index 56b70b20a..3d4a03dfa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.10-compact.zip
index 70b80b188..bf2289054 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.10-legacy.zip
index 1e44aed16..1da172d70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.11-compact.zip
index ad09fc05c..e86864006 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.11-legacy.zip
index 58722ea9e..43201728f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.12-compact.zip
index 58740fd92..f18dee6b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.12-legacy.zip
index bf353dd68..8941059f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.13-compact.zip
index a0ccc63c4..93759ec7f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.13-legacy.zip
index d7a1d7b53..e49a00051 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.14-compact.zip
index f3c992e4e..a77c441c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.14-legacy.zip
index a4ce13e10..05b48afcf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.15-compact.zip
index 6ee5ee3c3..3778b13f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.15-legacy.zip
index 5dc064109..2b9d47ca8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.16-compact.zip
index 9d8735ffa..e8fa12d38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.16-legacy.zip
index bc9ec7612..ea3d2b915 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.17-compact.zip
index 79b61c3c7..d5ae03986 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.17-legacy.zip
index 611d872c6..89cf3b072 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.2-compact.zip
index d7b53080b..90e4f690e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.2-legacy.zip
index 7e9b83241..5fa9dc5b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.3-compact.zip
index 467798fa4..009cda995 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.3-legacy.zip
index 8304f6a87..b4a3f048d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.4-compact.zip
index ba178f1e4..df8cc7f1f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.4-legacy.zip
index 57d9faadb..7243fe5df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.5-compact.zip
index 6354b410d..4f4a76025 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.5-legacy.zip
index 0761e0f45..3a1038a5d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.6-compact.zip
index 47085df8c..cef643e51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.6-legacy.zip
index 73447e31b..7f7d5144e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.7-compact.zip
index 2ad73b0c2..ced5beff1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.7-legacy.zip
index 60b1ae47c..d0f05c3bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.8-compact.zip
index cee8f2505..cf12bc1e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.8-legacy.zip
index 2bfdf92e6..4eae26d69 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.9-compact.zip
index 9d22a74b6..566d0d41f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.9-legacy.zip
index a2cb3f4d5..de58a171e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.5.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.0-compact.zip
index 6b3c85723..b0cc33482 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.0-legacy.zip
index e0c936079..0694d41f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.1-compact.zip
index ace56e835..03143233d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.1-legacy.zip
index 91ee51f07..38fad428e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.10-compact.zip
index b8bf594bc..df78e0c92 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.10-legacy.zip
index f8b007cd3..83eb6a785 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.11-compact.zip
index ad292dac6..0fb90f39c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.11-legacy.zip
index 1201b1636..af1919a65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.12-compact.zip
index de6d7c7d6..377baf2dc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.12-legacy.zip
index e9668ed54..a26b33d59 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.2-compact.zip
index 1727c2c73..1db0ac156 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.2-legacy.zip
index e05065e84..3e6f505ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.3-compact.zip
index e5af33407..4cb5fc8a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.3-legacy.zip
index 83a4400ad..2d4f7c68c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.4-compact.zip
index e05307467..658767e65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.4-legacy.zip
index 73d2d4bfa..849db3da4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.5-compact.zip
index ad5cd7ae7..ec60b0aea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.5-legacy.zip
index e13fa6209..94784fb7d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.6-compact.zip
index fce4c7123..05484b4e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.6-legacy.zip
index f57aa616f..ec784d76d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.7-compact.zip
index 894d5e453..eeef57658 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.7-legacy.zip
index 67d476906..25ddb78fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.8-compact.zip
index a6c44420f..dc5ec98e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.8-legacy.zip
index d5232af0d..4e5a592ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.9-compact.zip
index 96c8e719f..43b326703 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.9-legacy.zip
index 3f877d9b8..421b4c2be 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/literal-0.6.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.0-legacy.zip
index 344f06475..3bbb7454b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.1-legacy.zip
index 92e6a9270..abe6b6139 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.10-legacy.zip
index fbb2826c6..8018b67e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.11-legacy.zip
index 0ed1be336..d3791eeea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.12-compact.zip
index f4bf4dde3..be77d1d24 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.12-legacy.zip
index 9f0034712..d1581ddb1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.13-compact.zip
index c034fadb7..e6d5623f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.13-legacy.zip
index ffe02dfbd..6a8410cf8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.14-compact.zip
index cd0874965..7fe68f73e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.14-legacy.zip
index 3fde2ecd6..f001bb50b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.15-compact.zip
index dd0915939..d11bdc02e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.15-legacy.zip
index de4afce01..0b715429a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.16-compact.zip
index 879a8f2da..c790ebb80 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.16-legacy.zip
index 2a0d8eaf2..4b9dedd70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.17-compact.zip
index cb6f7e187..31165652c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.17-legacy.zip
index fc740d22a..01b9ebe41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.18-compact.zip
index f3d62c2cb..4b2efd42b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.18-legacy.zip
index c03672a83..45e4a9f51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.19-compact.zip
index 8b349f81b..dbe781313 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.19-legacy.zip
index f1ed6fc24..c7f859e44 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.2-legacy.zip
index b15aa1749..2e837cc18 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.20-compact.zip
index 10949708f..7ef32701a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.20-legacy.zip
index 4de6428df..9ff20ac78 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.21-compact.zip
index df3f1006d..761c46fe6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.21-legacy.zip
index caf8bffcc..017dd2d34 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.22-compact.zip
index c22fc8755..702ce6db9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.22-legacy.zip
index 7197a4467..3855b0538 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.23-compact.zip
index 6968f2472..e903b8cbc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.23-legacy.zip
index 22d3ea911..f93bb5f6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.24-compact.zip
index 9a6ba03b2..b02f88dbf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.24-legacy.zip
index ed8b812da..0e52f9ce5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.25-compact.zip
index 5c73b8ada..0d1f9a106 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.25-legacy.zip
index b2967859d..dfdd53334 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.26-compact.zip
index 43fcf8039..ec095f92a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.26-legacy.zip
index 5e9120868..9321ae930 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.3-legacy.zip
index bed03d0bf..be6210a27 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.4-legacy.zip
index 4b3238cb9..985ea0757 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.5-legacy.zip
index a259d2783..ca55afde5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.6-legacy.zip
index 7b0b46bd5..87514478f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.7-legacy.zip
index 56a76ae00..3234194c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.8-legacy.zip
index 862a97e38..e8a56640a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.9-legacy.zip
index c49b8ffba..ba1e0afef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.0-compact.zip
index 2e5a94a33..d19f562ed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.0-legacy.zip
index 768845443..38bec34f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.1-compact.zip
index fc47422e7..5885223d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.1-legacy.zip
index 011debcbc..cd96aecad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.10-compact.zip
index a20e05030..756470484 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.10-legacy.zip
index 3bdf4c982..0ab89d76b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.11-compact.zip
index 93852e546..0c58d4eab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.11-legacy.zip
index 891e711c9..bf74118e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.12-compact.zip
index 7e5c8fa47..838c80c14 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.12-legacy.zip
index 5108a39aa..e75b2af69 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.13-compact.zip
index e23b34f8b..519bd2269 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.13-legacy.zip
index 8c1cb65fd..75a3cf340 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.14-compact.zip
index d81c49847..22d68f1b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.14-legacy.zip
index 7948f22d5..04d803981 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.15-compact.zip
index 4811c3eb1..44dc6f926 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.15-legacy.zip
index 4a55b1c39..7ce894daf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.16-compact.zip
index 4052c38e2..cb47086e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.16-legacy.zip
index 1576661ff..3d65825e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.17-compact.zip
index e4ebfc711..6293ec71b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.17-legacy.zip
index e8a27835e..8af43c582 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.2-compact.zip
index 67810388b..a8e106c1b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.2-legacy.zip
index 7bdb64d82..e6bdf5f2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.3-compact.zip
index 79337dcb4..153996fa8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.3-legacy.zip
index 3ac06ec6d..5241c5750 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.4-compact.zip
index 5d429e1b5..3892c6209 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.4-legacy.zip
index a78c8131b..dd017f472 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.5-compact.zip
index 0d3201e83..f1859c89b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.5-legacy.zip
index 0d12e05e3..07db29ba6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.6-compact.zip
index 708b0f85a..df84fb2a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.6-legacy.zip
index 36a4ddf3c..9181558ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.7-compact.zip
index 0b04a4525..87d4715b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.7-legacy.zip
index 182a91ca7..5cb47c277 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.8-compact.zip
index 90b2e66ce..163092216 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.8-legacy.zip
index fb53b55f0..c819b35a1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.9-compact.zip
index ae1b8531b..16b5ca9d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.9-legacy.zip
index d1847ca26..37daf11e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.3-compact.zip
index 685d75c26..77c3f2aa2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.3-legacy.zip
index b586b6f68..1f33c2e12 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.4-compact.zip
index 16bf319bd..75db0a99d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.4-legacy.zip
index 5d7e4898a..8a2f9b5e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.5-compact.zip
index b107e8e87..1fea5866a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.5-legacy.zip
index 85705c8d1..35399a42d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.6-compact.zip
index 21617c3a0..6230d7343 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.6-legacy.zip
index aec755ce1..bd012589a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.7-compact.zip
index a1985066e..11a56d651 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.7-legacy.zip
index cbac8d25e..c34a985fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.8-compact.zip
index 0c6b1b3e1..d3eb7b816 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.8-legacy.zip
index 39ea9569c..2f578277b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.9-compact.zip
index cd602491e..ebb49bc10 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.9-legacy.zip
index 5a2177f42..15ca606dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.0-compact.zip
index dc116f727..fbd2ded71 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.1-compact.zip
index 12cc78441..0e747be9b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.10-compact.zip
index 7fbf16f49..30ad586fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.11-compact.zip
index 45281b19f..77167bc85 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.12-compact.zip
index 1c00b89c3..eec7748bc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.2-compact.zip
index 70ec202f2..9c5c175a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.3-compact.zip
index a41fa2717..86697a185 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.4-compact.zip
index decf0e7ae..f1f0d8fe1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.5-compact.zip
index 63d934dba..c7ff0406d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.6-compact.zip
index 46d29f29e..866842156 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.7-compact.zip
index 98c7491e2..d8ae373de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.8-compact.zip
index a12eec3cb..8a2b55960 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.9-compact.zip
index 8fddae746..45a53f50b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.0-compact.zip
index 920009682..36aeefab4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.1-compact.zip
index 0483ff875..6e069f227 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.2-compact.zip
index c9ab1197e..f32b59998 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.3-compact.zip
index 6181d1ca6..375811cd5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.4-compact.zip
index 971aebd31..55eb2b4a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.5-compact.zip
index c107b959d..c3ba1bf84 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.6-compact.zip
index 13bb81bb8..cb55eadcf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.0-compact.zip
index 67f475890..cfa773b63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.1-compact.zip
index ea7eb982c..e8da6ce32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.10-compact.zip
index a9e6e7173..a1b3f4137 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.11-compact.zip
index efd3a12ad..37df29adb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.12-compact.zip
index 02a64788a..bd77f5345 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.13-compact.zip
index dc52106f9..a22a633fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.14-compact.zip
index 1849ae733..43ce1cb8f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.15-compact.zip
index e94964608..9260c4f3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.2-compact.zip
index a9b81f46d..a4b9bdcea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.3-compact.zip
index 255a390cf..8d19dac98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.4-compact.zip
index 6fa73386a..3c7ca76fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.5-compact.zip
index 5acf10f18..9b3dd1633 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.6-compact.zip
index 44f108052..787fe6719 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.7-compact.zip
index 3ddd9e6af..42fa02654 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.8-compact.zip
index 58902e63b..4aa8e9b68 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.9-compact.zip
index 186d71696..566258a92 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/memberaccess-0.5.3.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.0-legacy.zip
index 7014257c7..51cea57f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.1-legacy.zip
index c802e041a..6aacd8b2d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.10-legacy.zip
index c300db837..1193c0642 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.11-legacy.zip
index f938f957d..0d64fcae6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.12-compact.zip
index 00e016edd..6a4d663e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.12-legacy.zip
index 54d9990d8..3aca37664 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.13-compact.zip
index f0df7ce60..601997ebf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.13-legacy.zip
index 9e5034acf..a2de744ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.14-compact.zip
index 4bacd2ef8..90931ce26 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.14-legacy.zip
index f28546c2d..2f653ee18 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.15-compact.zip
index 12a2b22a5..500bfa4b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.15-legacy.zip
index b1dd84d16..bcfe522ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.16-compact.zip
index 80ab28c7d..6c6203846 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.16-legacy.zip
index 37bb87e29..b758f1d92 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.17-compact.zip
index 6a019e5b0..e46adf51c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.17-legacy.zip
index 5976820a6..32e8cffe4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.18-compact.zip
index ae0842db6..c7a6d8215 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.18-legacy.zip
index 23673a341..ded90c5d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.19-compact.zip
index 1e413ac1e..467b0b1b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.19-legacy.zip
index 5fe5ac4f1..548a5687c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.2-legacy.zip
index 8a48ccf2d..37d0dc091 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.20-compact.zip
index a1cfab54b..56825bd44 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.20-legacy.zip
index ff3c47378..daa65b39c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.21-compact.zip
index 375d6e448..28949e3e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.21-legacy.zip
index e18ec4e14..2bf38e9c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.22-compact.zip
index ab805592e..d7e3a49d8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.22-legacy.zip
index 0cddd4e33..abe82406a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.23-compact.zip
index 3a328d614..eb8c3b211 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.23-legacy.zip
index 7eb68f635..bb5864e13 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.24-compact.zip
index a6b49ff3a..ea32bfb7f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.24-legacy.zip
index f208e9910..781be6f6a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.25-compact.zip
index 4af28b0e6..ef2cd960c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.25-legacy.zip
index 7191207a8..ac8260a55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.26-compact.zip
index 9055f0f9e..4e9e4d679 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.26-legacy.zip
index 05d0efb7e..1db34e6da 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.3-legacy.zip
index 3381cad0e..d47b61724 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.4-legacy.zip
index db2b989b3..fe8dde0cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.5-legacy.zip
index 0d69ba6f1..775a5607b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.6-legacy.zip
index 9d6bbbbd8..85ed1049f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.7-legacy.zip
index e00c7b6e0..1afcf26e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.8-legacy.zip
index 12a53638a..42e9e87c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.9-legacy.zip
index 33483a679..ac82ab1e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.0-compact.zip
index 6b8a0ce3c..dded88942 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.0-legacy.zip
index 2fdf73822..e2e8baf07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.1-compact.zip
index c5cf3967c..567dab34e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.1-legacy.zip
index 9ccc5c8ec..0d37595a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.10-compact.zip
index 43457c132..f2716aeda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.10-legacy.zip
index 2dadc3807..4d21c1126 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.11-compact.zip
index 39cbfe5bf..dc4564246 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.11-legacy.zip
index 960c4aba6..422b56c51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.12-compact.zip
index df03438d9..ab5e8577a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.12-legacy.zip
index b989fc9d3..e75fd3c13 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.13-compact.zip
index 44b6ad20e..7ae7c6ada 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.13-legacy.zip
index 6bada388c..a4e27646a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.14-compact.zip
index fd00d1d01..0b5b4db32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.14-legacy.zip
index e270269b3..081bb10c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.15-compact.zip
index 48ade5fde..52b454aee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.15-legacy.zip
index f0673064c..be2ec5587 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.16-compact.zip
index 93f66f8d0..2530a8856 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.16-legacy.zip
index 6e6b5aa8d..73262aacf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.17-compact.zip
index 95f94d66d..46ad23af2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.17-legacy.zip
index 1cceafe7a..441833907 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.2-compact.zip
index 7894dc279..75616cef2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.2-legacy.zip
index 9a9dde436..541f626dc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.3-compact.zip
index cf7425ede..00c58f0d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.3-legacy.zip
index b3fbc34a4..64e796d53 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.4-compact.zip
index 62c46a4f4..bb0e0dea7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.4-legacy.zip
index 7bdfb45b1..61cbb9a81 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.5-compact.zip
index 50ebe0174..8df276b7e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.5-legacy.zip
index d3ef8a59f..e584ba26f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.6-compact.zip
index 284c06f79..eed2db7ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.6-legacy.zip
index 80d057ef2..5d9af87ad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.7-compact.zip
index 233270d6b..a2cf960fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.7-legacy.zip
index 1bdde06a4..1b175d7f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.8-compact.zip
index 6840694b8..a049256e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.8-legacy.zip
index b5aa3309d..382cdd28f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.9-compact.zip
index c7f8bacf9..4e44df7f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.9-legacy.zip
index f125bea65..918bfe4fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.0-compact.zip
index 850aac914..f8d4cdb6a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.0-legacy.zip
index ebf770337..ff8a86f06 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.1-compact.zip
index 76b183597..28a4ae539 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.1-legacy.zip
index f4d2162e5..6b5f5e061 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.10-compact.zip
index 3bf7baefa..ea4a970d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.10-legacy.zip
index ab2767613..63e3aef1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.11-compact.zip
index 2cc3eed3c..bf620a4f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.11-legacy.zip
index 103572a9d..585ee8a65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.12-compact.zip
index 5fafb22d3..c26816585 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.12-legacy.zip
index 3f36f8a80..77dbeac03 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.2-compact.zip
index d0216d1d1..d3e1fe217 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.2-legacy.zip
index 892650305..d50e86b89 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.3-compact.zip
index 23df57133..b90e4d7ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.3-legacy.zip
index d0c6003de..f4839379c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.4-compact.zip
index 445be66ec..8e7f26836 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.4-legacy.zip
index 7bc63287b..786cbe055 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.5-compact.zip
index dae07a93a..c05decb96 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.5-legacy.zip
index 0736b1fea..d69fc1614 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.6-compact.zip
index 5c50bcf86..96a4a660c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.6-legacy.zip
index f5f2908f0..630d03405 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.7-compact.zip
index 75f8528a9..fcc3f50c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.7-legacy.zip
index 397c28dd1..50ebe5782 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.8-compact.zip
index b503e2505..344b840f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.8-legacy.zip
index 7eda225ca..361957a34 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.9-compact.zip
index 5d629b046..f353bfeda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.9-legacy.zip
index e23dbb698..04471d7f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.4.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.8-compact.zip
index 212d4fc53..ebd2d440a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.8-legacy.zip
index 97a4c65a6..ff579e96c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.9-compact.zip
index 89e2e05fd..02025f0a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.9-legacy.zip
index 8689e5052..a90271942 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.0-compact.zip
index 110a18177..b4abdc862 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.0-legacy.zip
index b21025df0..95486b664 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.1-compact.zip
index bde89e724..f40341123 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.1-legacy.zip
index fe72a70bd..395559f8c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.2-compact.zip
index 2a003aaf5..29397281a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.2-legacy.zip
index f3e120bc8..f4696f212 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.3-compact.zip
index 4dce33e80..68fc32ce5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.3-legacy.zip
index 054f96726..f6bb58e02 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.4-compact.zip
index 0dbba1f16..53046c2f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.4-legacy.zip
index 1c7e2f7a5..94f720067 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.5-compact.zip
index 74f16709c..fae46b186 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.5-legacy.zip
index 7aab66bc1..06d84faa5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.6-compact.zip
index 53dd96e8b..d0670d81e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.6-legacy.zip
index e884265b2..adfa05473 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.0-compact.zip
index 61710f589..cf212a417 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.1-compact.zip
index 36cbf94d3..688cdea45 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.10-compact.zip
index 139bb5a72..b497448f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.11-compact.zip
index ad793dde6..d12dea3e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.12-compact.zip
index 25312c516..df86beced 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.13-compact.zip
index 37bbb2b45..35d1612db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.14-compact.zip
index 682a042bf..131c74683 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.15-compact.zip
index 5ef0bb8c4..c61d3427f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.2-compact.zip
index 6124ab496..74c298cae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.3-compact.zip
index d5499c21a..c306e53fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.4-compact.zip
index f8a2a13f5..83f6cc65e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.5-compact.zip
index f39df616e..a682793c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.6-compact.zip
index 1e2b0588f..fd4a11d3b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.7-compact.zip
index 36ab7e423..c6f2e08bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.8-compact.zip
index 478dc6ac0..50b704839 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.9-compact.zip
index 9cf7c7c73..54fc84561 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.6.8.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.10-compact.zip
index ee8fe76d7..3de567c04 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.11-compact.zip
index 9a3cabe1d..4a85fb5e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.12-compact.zip
index 6a8bb4278..376cd8002 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.13-compact.zip
index c8e666786..e8551c6c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.14-compact.zip
index 717a27094..4ced3f466 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.15-compact.zip
index 02d59d00c..58aacb9cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.8-compact.zip
index 068aae413..8c3a50983 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.9-compact.zip
index fe9073e03..1e9c000a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/minmax-0.8.8.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.0-compact.zip
index eab87a486..6af0332ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.0-legacy.zip
index b5946691d..8c2f8b67e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.1-compact.zip
index 3d960b6b4..17635fa0f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.1-legacy.zip
index c19cda479..f3a11ab93 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.2-compact.zip
index 065df29b3..a700c0853 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.2-legacy.zip
index 4f749c9ca..608a261fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.3-compact.zip
index 24b6863ae..df65e9026 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.3-legacy.zip
index ed1aec78b..7f27a4f01 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.4-compact.zip
index bcd70d56a..fd48063e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.4-legacy.zip
index 4eaa1a25e..06cc9f075 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.5-compact.zip
index 1e5f938ad..5a3d86659 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.5-legacy.zip
index daa91f7bf..6124b97ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.6-compact.zip
index c69f3f426..67522afeb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.6-legacy.zip
index db8047403..a4ab34af3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.0-compact.zip
index 9d472762d..4cfb31178 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.1-compact.zip
index 1aafa0cbe..345f51425 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.10-compact.zip
index 70882f214..3b81c43fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.11-compact.zip
index 94bc29af8..2df1dce00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.12-compact.zip
index ffa634d55..7902eea00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.13-compact.zip
index c56bc86aa..bb89d163e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.14-compact.zip
index d833db792..d0a24bd77 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.15-compact.zip
index 466a99699..d141ba737 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.2-compact.zip
index 59e68af7a..b6235354b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.3-compact.zip
index f477ad171..be73b6a2f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.4-compact.zip
index 721779db1..12bff6ba5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.5-compact.zip
index 5bafac6b9..9ab30a9ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.6-compact.zip
index e0358444c..c1172e746 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.7-compact.zip
index f9d887546..bafb78782 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.8-compact.zip
index ddcc81093..c5812048a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.9-compact.zip
index ebd1e7f23..093692979 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-0.7.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.0-legacy.zip
index 512e114a1..c815cda75 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.1-legacy.zip
index 46a1a7d69..41e0bb02a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.10-legacy.zip
index 16f0e3694..d42d2bac5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.11-legacy.zip
index 9eb504d53..5052e14ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.12-compact.zip
index 9cfe55aed..0e40acd97 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.12-legacy.zip
index bda6fe0e3..481b2493c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.13-compact.zip
index d0d183716..e05870714 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.13-legacy.zip
index 579d9f6d0..c6f9af7b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.14-compact.zip
index ff506a007..9ef08914c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.14-legacy.zip
index 61a37cac3..36a5c279e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.15-compact.zip
index 062329dc3..43b69dcdc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.15-legacy.zip
index 148b2f868..b4eba0e25 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.16-compact.zip
index 1259e4e03..212b11467 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.16-legacy.zip
index 97c4f577c..b05c17a92 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.17-compact.zip
index 2106dc2cb..e8eac8d11 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.17-legacy.zip
index c7c6c92cb..9407b2cbf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.18-compact.zip
index 8dcf47e25..ce844f3eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.18-legacy.zip
index 8c756b719..bed3d9c93 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.19-compact.zip
index b90f8c07e..43160e537 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.19-legacy.zip
index 8c8fbab7d..26aee36fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.2-legacy.zip
index d5d0691db..87933190a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.20-compact.zip
index 7dbfd796b..7669cf9c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.20-legacy.zip
index f2f57278f..7d2d3768f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.21-compact.zip
index 620bceadb..62297073a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.21-legacy.zip
index bbe5db5a4..a2e852060 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.22-compact.zip
index 6d0ac5e34..2066ba3a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.22-legacy.zip
index ecf80602f..d062b4897 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.23-compact.zip
index a7b910323..d5b7d29de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.23-legacy.zip
index ba2050320..4096e8adf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.24-compact.zip
index 1222d8d8d..81bef7130 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.24-legacy.zip
index 873ee11fe..9810b5608 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.25-compact.zip
index c1b054e2e..c84e43a03 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.25-legacy.zip
index cb8cfb064..0441404f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.26-compact.zip
index 33c4637d4..521dcff37 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.26-legacy.zip
index 426d2c8c4..924031385 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.3-legacy.zip
index 66a2c1e66..b41d300f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.4-legacy.zip
index 380b08cfc..f6a05a647 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.5-legacy.zip
index 0c3808e7f..419c78c3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.6-legacy.zip
index 886617fd8..5a68d2dda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.7-legacy.zip
index f5374b523..55c22a84c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.8-legacy.zip
index 91de2e82a..8f871f8ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.9-legacy.zip
index 2646618af..8610e5fa9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.0-compact.zip
index e4ba62b56..5b14d244d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.0-legacy.zip
index 37484452a..25b90db56 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.1-compact.zip
index 87ea809a4..694cb9d35 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.1-legacy.zip
index af5d001c3..6927cc160 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.10-compact.zip
index 77d916a4b..fb2abf2d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.10-legacy.zip
index 0841d5658..397f07ec1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.11-compact.zip
index d032f2b7a..54d7ae514 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.11-legacy.zip
index 0d335e734..84d8dfff4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.12-compact.zip
index 5be174302..ec974cdb2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.12-legacy.zip
index 8cab71b12..22fba9f6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.13-compact.zip
index 8d47c01ba..8645bd705 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.13-legacy.zip
index 9d238eedd..f167596e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.14-compact.zip
index ce2f2fee0..228f5c6e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.14-legacy.zip
index a19d27957..b5ad1c7fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.15-compact.zip
index 1cdc76aa5..0871150b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.15-legacy.zip
index 1bb72e452..592a290cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.16-compact.zip
index d1b0b62b7..0c3cb0d69 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.16-legacy.zip
index 689a5c537..2cebce594 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.17-compact.zip
index ff7a96a21..92c10a7cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.17-legacy.zip
index 5ac31105d..696fc66de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.2-compact.zip
index f7ab71d36..2bea76edc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.2-legacy.zip
index edd73a4f2..8d79b1cbe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.3-compact.zip
index adc49dd65..c146744f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.3-legacy.zip
index 2d796d9d2..fb1992262 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.4-compact.zip
index 9e67e1ca4..a0a35a070 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.4-legacy.zip
index b3155aa1e..362e17d5d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.5-compact.zip
index 161c2c949..4cb411269 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.5-legacy.zip
index a48e14e83..559b05c4b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.6-compact.zip
index ab38ddb1b..0c2e26ad2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.6-legacy.zip
index 859da901f..c97898517 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.7-compact.zip
index 6c6c20763..090209d77 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.7-legacy.zip
index 766b7c3ce..26b1d1ba0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.8-compact.zip
index 71684668d..2a46bb162 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.8-legacy.zip
index 81f0cf7bc..623527d06 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.9-compact.zip
index 1bf4d20c7..e60d83491 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.9-legacy.zip
index a0b755b69..aa32969c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.0-compact.zip
index ef0921946..c26deb087 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.0-legacy.zip
index 8cc3597bb..ae435c08a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.1-compact.zip
index 0eb1ab76c..3c15be241 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.1-legacy.zip
index fe374bfc8..4fe508cbd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.10-compact.zip
index a3242275a..d0560f059 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.10-legacy.zip
index 0d32b9295..bc6916df8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.11-compact.zip
index f451b3b4c..dde44629c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.11-legacy.zip
index ec059f545..5e3527e45 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.12-compact.zip
index 6c3f55506..6d8fa61a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.12-legacy.zip
index 660fee4d8..82dd40722 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.2-compact.zip
index c8505fd5e..d78ac4864 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.2-legacy.zip
index 5bb2253c7..2b06478d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.3-compact.zip
index d69bb15d1..aa04f7d2d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.3-legacy.zip
index cb0ed5559..0d199222b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.4-compact.zip
index 9324b2642..708e6e7df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.4-legacy.zip
index 7e2fab9ca..05cceccbc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.5-compact.zip
index 475877da5..dee4126c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.5-legacy.zip
index 2f7403ebb..9f92ababf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.6-compact.zip
index a1d38344e..464960716 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.6-legacy.zip
index 1c1675d37..c69790cbd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.7-compact.zip
index 0ee4e9521..78d7506c8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.7-legacy.zip
index a58bb7027..15385b29c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.8-compact.zip
index cd1f9b9e6..6c02c834c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.8-legacy.zip
index 9366754ec..993433983 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.9-compact.zip
index 5076082d6..9878bbca9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.9-legacy.zip
index f91f96d4e..c7da50e0f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.0-compact.zip
index 0a7a5738d..518b4a5fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.1-compact.zip
index cefe498b5..674d5ea3d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.10-compact.zip
index 8dd173562..803444662 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.11-compact.zip
index 5b262c837..779a8964b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.12-compact.zip
index 6159756b9..4f604ab96 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.13-compact.zip
index 41d76763d..a69e4d9b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.14-compact.zip
index eac4ef5fe..1e21224a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.15-compact.zip
index 9db5d2399..dc00b39ea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.2-compact.zip
index 4cff0e904..c842993e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.3-compact.zip
index c5b0b7f1a..769aea17f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.4-compact.zip
index fb11df4ae..68467fdbb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.5-compact.zip
index 7418627bb..52400c59a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.6-compact.zip
index b157c944e..d21f59dbb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.7-compact.zip
index a5d2432e0..d5b7be3d6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.8-compact.zip
index 495688081..f742f649a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.9-compact.zip
index 7d915f29b..37f77c9cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/modifier_identifier_path.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/negate-unary-element.sol-0.8.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/negate-unary-element.sol-0.8.16-compact.zip
index c18e5091b..bafddd7bd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/negate-unary-element.sol-0.8.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/negate-unary-element.sol-0.8.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.0-legacy.zip
index cb727b636..d371f2568 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.1-legacy.zip
index 03d492017..d2fa052cc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.10-legacy.zip
index e3402eb0b..136650037 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.11-legacy.zip
index 01b30fc47..6b8085a1f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.12-compact.zip
index c7ad152c8..087976140 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.12-legacy.zip
index bd60d3c5a..890355960 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.13-compact.zip
index dcf7837b6..580bdc71e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.13-legacy.zip
index 5babb0425..9ae14fbe3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.14-compact.zip
index 3251360ae..a896d1d6d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.14-legacy.zip
index d31a0037f..9bd86a179 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.15-compact.zip
index 5f505c059..600fff32c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.15-legacy.zip
index 136506803..94a7b3de2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.16-compact.zip
index 69d38ecec..4313cd5e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.16-legacy.zip
index 0864a9400..d4b9013b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.17-compact.zip
index b3ce2a96b..a5eb66566 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.17-legacy.zip
index 34d455d26..4dcade0fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.18-compact.zip
index 80a6745e2..cf762d17c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.18-legacy.zip
index 9fbbc3469..68881391c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.19-compact.zip
index 311f4a5b4..c927b5379 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.19-legacy.zip
index a478def4a..3724ea0b2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.2-legacy.zip
index 309fac13f..c6cfbc50a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.20-compact.zip
index a535bea5a..3dde9a6cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.20-legacy.zip
index f616b09ac..78e16fb80 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.21-compact.zip
index 895d76a19..cc4796a12 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.21-legacy.zip
index eae9690d1..bc7c35e2e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.22-compact.zip
index 7cfeffaf5..4b5d5d379 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.22-legacy.zip
index 8be06fbf6..8951dfbeb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.23-compact.zip
index 7f9f9c215..ecdd1cfa1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.23-legacy.zip
index 7dd5d2827..5ec25457f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.24-compact.zip
index 93389a37e..06cc8fb17 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.24-legacy.zip
index bd2b393f2..e4580c08e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.25-compact.zip
index afbbf79fc..a60653c57 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.25-legacy.zip
index a9d0e1950..0aea73c26 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.26-compact.zip
index 807e29b0d..d34b6f2ed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.26-legacy.zip
index b463a15ea..e3f6ff432 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.3-legacy.zip
index f91ef710f..67ef2dba8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.4-legacy.zip
index 2e0ba623f..8ca981426 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.5-legacy.zip
index f689c3aa1..41f3d2fb3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.6-legacy.zip
index 8b429a715..fab234522 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.7-legacy.zip
index f7c6b7c8b..f4dacdf11 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.8-legacy.zip
index f4329fc96..263a76342 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.9-legacy.zip
index 2d2364754..ba37b649c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.0-compact.zip
index 432ffde08..c64122c61 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.0-legacy.zip
index 797db5ee5..84766a12f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.1-compact.zip
index 0d02c946b..a7f15bf34 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.1-legacy.zip
index 74016e644..1e448a121 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.10-compact.zip
index 4da5650de..4eb3a7479 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.10-legacy.zip
index 3c8f73cce..65bcd8309 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.11-compact.zip
index e1c29d369..0745100a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.11-legacy.zip
index a17bbfd7d..983430bfc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.12-compact.zip
index 54a19729b..9705d77c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.12-legacy.zip
index d63f516c3..7773215ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.13-compact.zip
index b7ced3d52..0894e2457 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.13-legacy.zip
index 70010bb01..85e1d5336 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.14-compact.zip
index 3d0e6cde1..b569e83d9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.14-legacy.zip
index dd3fa4bc0..5887566c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.15-compact.zip
index 3a40e83df..048a659d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.15-legacy.zip
index 149d7dc17..46d8f57b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.16-compact.zip
index 29a301886..d5b391e68 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.16-legacy.zip
index 6df087bd9..acc008226 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.17-compact.zip
index cc0733ab4..dcda0988f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.17-legacy.zip
index 9ea5cf32d..fa9493e4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.2-compact.zip
index 6d412b630..bc4cc92d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.2-legacy.zip
index 7543c3ca3..58fc38923 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.3-compact.zip
index f3b8b7532..b637a2178 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.3-legacy.zip
index 8a254900c..2d359dd77 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.4-compact.zip
index f3f08124b..d932aa6dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.4-legacy.zip
index e464922dd..cb2dcd141 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.5-compact.zip
index 8102876b4..025855a78 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.5-legacy.zip
index fb546ec1f..c0662ef8f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.6-compact.zip
index 2fb7e077b..b81024c89 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.6-legacy.zip
index 3821c7e67..5ded33d70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.7-compact.zip
index bcea9d63a..b30e4b20b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.7-legacy.zip
index 015376350..a81275778 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.8-compact.zip
index 99f190148..7690ec360 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.8-legacy.zip
index ed0f92e42..11c16b7a0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.9-compact.zip
index a7249aa30..aeaa86fd1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.9-legacy.zip
index 308d5c721..eda5fb6d6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.0-compact.zip
index aa188776e..a28e2e8ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.0-legacy.zip
index 86fd66f47..b0188ae00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.1-compact.zip
index 8214ceca1..c322fa1a1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.1-legacy.zip
index bcadbad2b..bfba1bad1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.10-compact.zip
index e8310c3bd..b95d76d02 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.10-legacy.zip
index da200f229..87792604a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.11-compact.zip
index 6b4c25b33..2161d78cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.11-legacy.zip
index d072a30d5..e92934c16 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.12-compact.zip
index c6ccef1e9..b9500d653 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.12-legacy.zip
index 22513bd47..d6f96c03a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.2-compact.zip
index 286655491..e9a5e66a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.2-legacy.zip
index 5715db5b0..bb06b70ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.3-compact.zip
index 1c0416adc..277c5584e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.3-legacy.zip
index c169a97f1..788fb1404 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.4-compact.zip
index 32da31622..e9f3c7c37 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.4-legacy.zip
index 2694273b9..0ea70f57f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.5-compact.zip
index 7e50c119d..5aad3601b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.5-legacy.zip
index 92c041802..4835064c2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.6-compact.zip
index 691fbdadd..be03512ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.6-legacy.zip
index cdc018673..8b6731964 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.7-compact.zip
index abfb2002e..4bdcaedab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.7-legacy.zip
index 0cc833702..5680bf764 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.8-compact.zip
index 604c014ec..6c9e1eed6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.8-legacy.zip
index 2763491ab..54171d2b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.9-compact.zip
index fe256b8b6..76895c85c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.9-legacy.zip
index af5ce101f..8070080a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.0-compact.zip
index 86fe1aaeb..0cce1c027 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.0-legacy.zip
index 8d6f8d7c3..1a9c8526a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.1-compact.zip
index cd8e6f349..1ac77a7d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.1-legacy.zip
index 6bb85a44c..241023c22 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.2-compact.zip
index d94b79f2a..697799d61 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.2-legacy.zip
index cdba5a606..5da876019 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.3-compact.zip
index b8b12ad04..52eb0617e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.3-legacy.zip
index 7eae29fe4..a55d27aa7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.4-compact.zip
index 7a80fa771..9aef6fbab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.4-legacy.zip
index 712e48f32..58646fed9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.5-compact.zip
index 8ec0c8b47..fc0260792 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.5-legacy.zip
index 33a8acaaf..58fc87c21 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.6-compact.zip
index 16083314b..77524f9f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.6-legacy.zip
index 3a0e4bce7..6b39aa7f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.0-compact.zip
index 21a429f47..1cffd25b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.1-compact.zip
index 40eac362a..787798069 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.10-compact.zip
index af56523eb..a3baf0ab5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.11-compact.zip
index 828d81aef..cdfb56008 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.12-compact.zip
index f5e0e6554..f211cdddb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.13-compact.zip
index e1d764253..7c533b5c8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.14-compact.zip
index bb0b279b7..5fb0f7719 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.15-compact.zip
index 96749d0f2..ecdbc327a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.2-compact.zip
index 5ff329582..7095d8052 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.3-compact.zip
index 04a2d5e03..5c7811ecc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.4-compact.zip
index a7c2f1ba8..5bc3cd474 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.5-compact.zip
index 2777bf2b8..9f235e6a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.6-compact.zip
index 6aeec94b5..e41deaffa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.7-compact.zip
index 92ed2d2e4..a26be1d07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.8-compact.zip
index 2be8a3a0b..fa3d6a461 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.9-compact.zip
index b1e838425..c5963ef92 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/newexpression-0.5.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.0-legacy.zip
index 3c89423f3..0477c2f3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.1-legacy.zip
index 5d46c5e27..8b45013ad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.10-legacy.zip
index 321b6de17..228df0466 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.11-legacy.zip
index 67cbfa9b4..b502827cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.12-compact.zip
index 25d79d21e..35db95d43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.12-legacy.zip
index dc1a7d063..325b6a107 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.13-compact.zip
index 7c6377f30..facb58756 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.13-legacy.zip
index e29cd7442..edd68086f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.14-compact.zip
index 3a62933d5..847757707 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.14-legacy.zip
index 04c0b2ca8..8dc6eaebb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.15-compact.zip
index c0e79556b..ea393c024 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.15-legacy.zip
index 01bf8fc2e..4368c8258 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.16-compact.zip
index bf57dcb94..0847e6266 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.16-legacy.zip
index b1156e625..bb9c5219f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.17-compact.zip
index 52110d28c..963b9c112 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.17-legacy.zip
index 4e37ee2f9..634b0916a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.18-compact.zip
index fca69ec14..2d1c89519 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.18-legacy.zip
index a6d733de1..fcdea001c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.19-compact.zip
index f3b699333..ed17d913c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.19-legacy.zip
index 3d3577c77..e3b85aaab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.2-legacy.zip
index 986e8cc37..589ee5ef4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.20-compact.zip
index 4e4690151..e50ca523a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.20-legacy.zip
index dc9cab0c7..b20c3689f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.21-compact.zip
index d93f870ae..71f2a4d46 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.21-legacy.zip
index b8e3719e0..b9c0f0e21 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.22-compact.zip
index 4a4676ed4..516915bc1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.22-legacy.zip
index 4674958bf..33c717523 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.23-compact.zip
index 8b013a674..70c138156 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.23-legacy.zip
index 4db8ed303..3ea94cb51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.24-compact.zip
index f5b84ca96..162ee1194 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.24-legacy.zip
index 5aab3d4ba..c7bb33550 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.25-compact.zip
index 35645b5a7..e6cc34265 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.25-legacy.zip
index 9fe57f52f..ae865fb55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.26-compact.zip
index 03707e5dc..eb4424c15 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.26-legacy.zip
index 018d803a9..16f78c48a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.3-legacy.zip
index a60352760..53ea00477 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.4-legacy.zip
index f333426f0..a3b2d5189 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.5-legacy.zip
index 1b565dcea..823d744e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.6-legacy.zip
index 4b37e1920..b7898fc40 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.7-legacy.zip
index 3760efd4c..733b63176 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.8-legacy.zip
index e06f2021d..54e90bb94 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.9-legacy.zip
index d1f21aca6..604d86730 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.0-compact.zip
index 6656aa2e2..a84b720d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.0-legacy.zip
index 267a25e10..01dbda801 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.1-compact.zip
index b9ebe6dcd..a97209f97 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.1-legacy.zip
index f76b3170c..f0499800b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.10-compact.zip
index 211fb46e2..e07eb4305 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.10-legacy.zip
index 6d6566e2d..9b4b10fff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.11-compact.zip
index 5ce71f66c..59faec0d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.11-legacy.zip
index fca81abb4..119e2eaf0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.12-compact.zip
index 655d86419..43b07bd49 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.12-legacy.zip
index 17de0fc4f..ab83686b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.13-compact.zip
index add61575e..88f7b4654 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.13-legacy.zip
index 28996b989..cc177a63b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.14-compact.zip
index 040078cb7..c28426b99 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.14-legacy.zip
index b53a415ff..9610ab17d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.15-compact.zip
index f548115d1..2d2d6dee4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.15-legacy.zip
index a4434173e..585a4363b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.16-compact.zip
index eaeccd922..87814c64e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.16-legacy.zip
index 17a12196d..9cb5b368f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.17-compact.zip
index df7d09dd4..a39750de5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.17-legacy.zip
index e6ed1bc95..dbfdef777 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.2-compact.zip
index 284179125..fadd2a62a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.2-legacy.zip
index 658a46e9f..150b2e3de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.3-compact.zip
index 4b5469a73..2f39e6ec4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.3-legacy.zip
index 3793847ee..7c7c9498f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.4-compact.zip
index f5227ac80..dea98237e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.4-legacy.zip
index 86cc5e6a5..b4145bbf2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.5-compact.zip
index 60b027d8f..e70244d4f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.5-legacy.zip
index b141e7019..3dafba1be 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.6-compact.zip
index a2fbe37bd..dbb5abf71 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.6-legacy.zip
index df619bfbc..6504ebe62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.7-compact.zip
index 950e32adb..455d11406 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.7-legacy.zip
index 4efa5e6f5..eb245d874 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.8-compact.zip
index 8a9bfcbfb..c3d10be6d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.8-legacy.zip
index 29919c92c..acb846b37 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.9-compact.zip
index ba6100c31..d8dd87d09 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.9-legacy.zip
index e53200de2..ed199b757 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.5.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.0-compact.zip
index 0e25a0fa7..d83977f6d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.0-legacy.zip
index 997eca77d..1282e9481 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.1-compact.zip
index ab7446598..3bbcdbece 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.1-legacy.zip
index 9d221e97e..35cde65d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.10-compact.zip
index e1805ee35..d71877dd7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.10-legacy.zip
index f99e7151b..7e4a71d71 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.11-compact.zip
index a15a6043f..ba4e5cdc5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.11-legacy.zip
index eddc9b981..c5c322829 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.12-compact.zip
index b4d927083..1c71212b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.12-legacy.zip
index 2df3bdf0f..25cab630b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.2-compact.zip
index 96e4803f3..a51935a05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.2-legacy.zip
index 03f706cf8..72902f76b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.3-compact.zip
index 4e3389e32..edec2c60f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.3-legacy.zip
index 130963af1..9b5e2c226 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.4-compact.zip
index 40aa39138..4df6cb2c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.4-legacy.zip
index c98495985..736ffea54 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.5-compact.zip
index d322206e8..e5f7643c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.5-legacy.zip
index 46e18f709..44a2240f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.6-compact.zip
index 94c7540c8..7201052f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.6-legacy.zip
index 6c676722c..0a44a8605 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.7-compact.zip
index 14bc148bc..47932fc65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.7-legacy.zip
index c63586ac7..1e9e60a6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.8-compact.zip
index 15c32cb06..48834fe52 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.8-legacy.zip
index 7f891e45a..35993e414 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.9-compact.zip
index 7660f9a01..b74ac6cb1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.9-legacy.zip
index f6b1598e5..0b6897591 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.6.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.0-compact.zip
index 2f8647c7e..b61ec0a41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.0-legacy.zip
index 9e9fb2194..4aee58ef9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.1-compact.zip
index a66b428fa..2704cc506 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.1-legacy.zip
index e3d4d01a1..fa095eba2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.2-compact.zip
index 923340ee2..97266b8d9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.2-legacy.zip
index b5741fdae..b1e94d8a1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.3-compact.zip
index 83044f93d..98f74209e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.3-legacy.zip
index 9e82d4b2f..8489367b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.4-compact.zip
index d71b604c2..2ff32b2b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.4-legacy.zip
index 991af1ad2..e653830e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.5-compact.zip
index 6161578ca..5f784398f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.5-legacy.zip
index 3b25f0177..a8bc83592 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.6-compact.zip
index 66a3e37fd..035983363 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.6-legacy.zip
index b672be8fe..5b4ed1f50 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.7.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.0-compact.zip
index 77c99df49..1ccabedbd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.1-compact.zip
index eb2c0c0c5..4051400d9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.10-compact.zip
index 4a327de21..ee833ac75 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.11-compact.zip
index 00aa3cbee..f6715143a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.12-compact.zip
index bc0fb447a..4d19d19f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.13-compact.zip
index 37c80b75b..f613793dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.14-compact.zip
index 60fcc04d0..82086183a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.15-compact.zip
index d2c5e04e1..ac9ac1d86 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.2-compact.zip
index 83a7d45e4..2af591583 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.3-compact.zip
index 2e89618a8..6e0c9f93d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.4-compact.zip
index dc820c1ff..5c3c63df8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.5-compact.zip
index dc826777d..b62adc01f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.6-compact.zip
index 587422693..aa08b5f43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.7-compact.zip
index 31b7d31b0..e416e618a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.8-compact.zip
index db0cace46..40a85b5ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.9-compact.zip
index 7737c462b..4b5a99e95 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/pragma-0.8.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.0-legacy.zip
index d5d736886..d4ea16680 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.1-legacy.zip
index ff9027d39..e475652f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.10-legacy.zip
index 06097b38d..b04957709 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.11-legacy.zip
index 6cc0e405b..1e33b0288 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.12-compact.zip
index d00f99870..2410168a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.12-legacy.zip
index 500b89cf7..00125f64f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.13-compact.zip
index 68bd83d46..519bfaa3d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.13-legacy.zip
index 7e605695d..0257bc17b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.14-compact.zip
index 3bad692ff..cce187187 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.14-legacy.zip
index fea41491b..79484ebc1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.15-compact.zip
index 00c26bc63..9a0e9372a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.15-legacy.zip
index ea380050e..f759b914f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.16-compact.zip
index 47f1f4693..de08ad01c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.16-legacy.zip
index bd421c0cf..a7b17b804 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.17-compact.zip
index ed14f9c72..0109b9eea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.17-legacy.zip
index 720725405..9f90f46fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.18-compact.zip
index 192a54408..239460e22 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.18-legacy.zip
index 5f0e39103..68d4c938b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.19-compact.zip
index 012fb267a..b27ffdf39 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.19-legacy.zip
index 653dceee1..879d8c824 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.2-legacy.zip
index 39da44004..c68880635 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.20-compact.zip
index 4e23c11b4..34fd076b2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.20-legacy.zip
index d93e26925..57686b39d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.21-compact.zip
index c65ab19bb..b5e8a6dfe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.21-legacy.zip
index 9614764ab..2c2712d7c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.22-compact.zip
index bf6ad386d..caf63a771 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.22-legacy.zip
index 955507938..6343ca36b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.23-compact.zip
index ae6d97872..8bd7c0897 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.23-legacy.zip
index 260f2d341..d6db979b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.24-compact.zip
index 2f32ad227..a287bb4e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.24-legacy.zip
index 46c88e1a3..8a1c258bc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.25-compact.zip
index 8589efb82..538bb6e0a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.25-legacy.zip
index 779be78e1..efcfe5617 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.26-compact.zip
index 154b9a4a1..8af10e4b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.26-legacy.zip
index 7a89bba00..68b4b5a7f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.3-legacy.zip
index a2ada70c8..c48214ef7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.4-legacy.zip
index a69b3e724..ce1b4b9f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.5-legacy.zip
index 88105a7df..66b223346 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.6-legacy.zip
index f3a0178d9..6d12ac83f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.7-legacy.zip
index be5493654..f62a37486 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.8-legacy.zip
index be1d267ec..a3aad6c11 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.9-legacy.zip
index 5d8eb3e91..db32e5c65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.0-compact.zip
index 39581d359..3e81b4bb3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.0-legacy.zip
index 476c5061f..6e07becca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.1-compact.zip
index fab0fd346..f6884380f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.1-legacy.zip
index 1d0613c87..caf136f1f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.10-compact.zip
index bbc088fa8..31ad9480e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.10-legacy.zip
index 76ca892a0..9bb03317b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.11-compact.zip
index a1fca04ed..dd094248e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.11-legacy.zip
index b7c152591..5f9d79d90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.12-compact.zip
index f800dea93..c147471e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.12-legacy.zip
index a52b43e1e..6867ac21a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.13-compact.zip
index 4c9d60df2..2c1a8082e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.13-legacy.zip
index 573dcca5d..420bc58ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.14-compact.zip
index 6296def06..a0bbfaf9c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.14-legacy.zip
index 2ab12e957..56bf44665 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.15-compact.zip
index 73b37ad09..05cff6901 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.15-legacy.zip
index 878031060..e91fdaceb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.16-compact.zip
index bfd91330e..fea9f4937 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.16-legacy.zip
index cdd490a7d..9ed708184 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.17-compact.zip
index 3606478d4..2e4e3050f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.17-legacy.zip
index ec88b73e6..96c133e8e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.2-compact.zip
index e48afccf3..ac321bc23 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.2-legacy.zip
index faf7b7420..21142c3db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.3-compact.zip
index d5506428b..a0136cf8e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.3-legacy.zip
index 1d043def4..12826f722 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.4-compact.zip
index dc8ada539..2ee5b33b7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.4-legacy.zip
index 230004af5..3f344c856 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.5-compact.zip
index 5f93f6081..2c124d076 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.5-legacy.zip
index 6f4483823..f97245e16 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.6-compact.zip
index 67570f445..bd96da090 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.6-legacy.zip
index ed386101a..dbfadbeef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.7-compact.zip
index 19c7b95f0..512b3acda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.7-legacy.zip
index 3fa08aa35..05a21e4e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.8-compact.zip
index 14a8a83b3..4b031afe4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.8-legacy.zip
index da34c25db..03cb3ddf6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.9-compact.zip
index 66ce4b42d..c398c0ea1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.9-legacy.zip
index c07fe8318..cbaf277b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.0-compact.zip
index 556278bfb..0dbdb45f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.0-legacy.zip
index 2838eccba..5fb0225ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.1-compact.zip
index 31864ac53..63b9ea820 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.1-legacy.zip
index 542451ba0..689350df4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.10-compact.zip
index d8cfc5d43..faeea8444 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.10-legacy.zip
index 5f06f682a..6c4829e39 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.11-compact.zip
index 335a96b09..66b251f3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.11-legacy.zip
index 7de685e14..9e5a44a93 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.12-compact.zip
index 1f9e809b1..7f4c82034 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.12-legacy.zip
index e746dd642..b9ecb505a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.2-compact.zip
index a7fb031d9..2c6864f0e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.2-legacy.zip
index 1fa34dc52..2564ce075 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.3-compact.zip
index 7c5beb409..032d3801a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.3-legacy.zip
index aff3f6fa2..3f5decf4c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.4-compact.zip
index 07c3123d9..83083415e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.4-legacy.zip
index 9267f62e4..828cf227d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.5-compact.zip
index 0a95fe064..4ffa6a035 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.5-legacy.zip
index 5973a6ba8..451b8ebcb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.6-compact.zip
index 0f3271cdf..d1610c8ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.6-legacy.zip
index de120ba17..2cb55c56c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.7-compact.zip
index e548a7c4c..ac59ede58 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.7-legacy.zip
index c2eb3ce7d..9c5ecf1f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.8-compact.zip
index c9cc59864..f37d3f77c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.8-legacy.zip
index 83a41a555..0e3359ccd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.9-compact.zip
index bf49b7e96..b57d08a06 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.9-legacy.zip
index e700abdbf..1d7ce8964 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.0-compact.zip
index 428a77d79..aaba36e04 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.0-legacy.zip
index 46c400178..134818f5c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.1-compact.zip
index f456461db..5e95d5f37 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.1-legacy.zip
index d2edb67ea..ae463ef9f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.2-compact.zip
index 6d6fd261d..06d09615e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.2-legacy.zip
index c2beb4e9f..64c3db86a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.3-compact.zip
index 3e1201d63..4bb8ede43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.3-legacy.zip
index 99850496f..a8e1c8e58 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.4-compact.zip
index 0f43855d4..2cbdbf01b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.4-legacy.zip
index eab272bd0..55bda9a1f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.5-compact.zip
index faa2445ba..89ec103c2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.5-legacy.zip
index 5fda0a946..161956110 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.6-compact.zip
index f3ed53314..cc84cf5c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.6-legacy.zip
index a06d4406c..9b8110f30 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.0-compact.zip
index 482675da6..b927dee05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.1-compact.zip
index 5e0bbf7ac..9d529b1d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.10-compact.zip
index 6ed970ba4..fea7f398d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.11-compact.zip
index e97714a02..21493b974 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.12-compact.zip
index a658fa8d8..9da825c77 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.13-compact.zip
index 1582a5954..b4ae0ecf5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.14-compact.zip
index a6c6125c1..19c0818b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.15-compact.zip
index 4b8c2ebbb..582656a6e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.2-compact.zip
index 365f0128c..f87c949a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.3-compact.zip
index 0e17c96a0..6bddef15e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.4-compact.zip
index 366d327ff..d1bd58f22 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.5-compact.zip
index 2d86fd516..5b99aa249 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.6-compact.zip
index d8e25277d..a5c27bc46 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.7-compact.zip
index ca2806ff0..47ae06667 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.8-compact.zip
index 0076fd7fb..33b950ef2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.9-compact.zip
index 931b0ec64..f4e33dc1f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/push-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.0-legacy.zip
index 2b38d19b9..53bdb2e3a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.1-legacy.zip
index 67b7d230f..b6d9b931f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.10-legacy.zip
index a2558bca7..2013d90ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.11-legacy.zip
index 2027042cc..5a5b035d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.12-compact.zip
index 05692ba98..91a617e2d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.12-legacy.zip
index fc36695a2..227f62145 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.13-compact.zip
index d61d511ed..25d8d6c63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.13-legacy.zip
index 97a68eb02..0052083ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.14-compact.zip
index a7af6056c..4fcd3c862 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.14-legacy.zip
index af87e13f4..f0241139c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.15-compact.zip
index 32bdd2181..9e8b8e98f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.15-legacy.zip
index 87f56eb8c..b1d388cac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.16-compact.zip
index 4bafc568c..05aad2052 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.16-legacy.zip
index ab6c3c00c..f6452ba73 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.17-compact.zip
index 18305b0fa..d347ab057 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.17-legacy.zip
index b02536338..51897fed6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.18-compact.zip
index 69abfd1cc..25fbefdf6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.18-legacy.zip
index c458e8be9..15e8335a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.19-compact.zip
index 8dc110621..fcb5b5604 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.19-legacy.zip
index 314fc3a90..40994002d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.2-legacy.zip
index 810eb3361..b584e6750 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.20-compact.zip
index ddac4cbb2..424cb6cfc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.20-legacy.zip
index 9923f2949..a45a8c123 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.21-compact.zip
index add9d4d50..93c268562 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.21-legacy.zip
index 1a95a54c4..ed60053b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.22-compact.zip
index cf735fdf4..d3102178a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.22-legacy.zip
index a8eb7a1a7..d6367fc42 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.23-compact.zip
index 8331ae225..536127527 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.23-legacy.zip
index 7899964a4..d7a586a3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.24-compact.zip
index 23f5bd574..63dd51c21 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.24-legacy.zip
index 3eced4a44..13f64d725 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.25-compact.zip
index aae43dbce..29c61a01b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.25-legacy.zip
index ff7f7c180..d13ead1a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.26-compact.zip
index 2ac44e8c0..740b54967 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.26-legacy.zip
index aaca5a697..e862ec29d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.3-legacy.zip
index 7f04f82a1..28c8a03a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.4-legacy.zip
index d920a4416..111f27945 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.5-legacy.zip
index 605df761c..10d06c011 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.6-legacy.zip
index e03ea9bb9..5f2c02bd7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.7-legacy.zip
index ae4be8a0a..b5110fd1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.8-legacy.zip
index f42b63ee8..9dd2420e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.9-legacy.zip
index 9b5b18cd3..26c927e91 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.0-compact.zip
index f356446dc..8648ee290 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.0-legacy.zip
index 9497feddb..3379cf4fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.1-compact.zip
index 07e8aed96..f85f0e1a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.1-legacy.zip
index 934beadd1..45bc453a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.10-compact.zip
index 99e64308c..1752709d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.10-legacy.zip
index 215cc7eae..f19ec8a88 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.11-compact.zip
index c6cecebb8..714fafd8d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.11-legacy.zip
index 796de6edb..1d3923b1b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.12-compact.zip
index c8889b861..fb294b324 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.12-legacy.zip
index f040b82a3..8c0f2c5b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.13-compact.zip
index 962d069fa..c978d6de6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.13-legacy.zip
index e1c2b3ebe..3b10ef055 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.14-compact.zip
index 9f078480e..defa589d8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.14-legacy.zip
index 7b64271f7..73d116e3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.15-compact.zip
index 30a5cab1f..cbf09e76c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.15-legacy.zip
index 09d64f2a8..2eee21323 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.16-compact.zip
index b6d83c1c3..81dcc68a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.16-legacy.zip
index 316cc391a..eb9c2a01c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.17-compact.zip
index 879eb8bc8..9a578a7a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.17-legacy.zip
index e961c4157..57236d2b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.2-compact.zip
index 88a937f2f..23a8d298d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.2-legacy.zip
index ad475351f..d45680a49 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.3-compact.zip
index 9b92a6587..b52d4fddd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.3-legacy.zip
index 49c4e95c9..298eeb8dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.4-compact.zip
index 8ad45a985..424624c22 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.4-legacy.zip
index 457ccd289..ead0bb146 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.5-compact.zip
index 8171568d9..3f21d9f41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.5-legacy.zip
index 043d43dd2..666098408 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.6-compact.zip
index 54ad59992..521587a8b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.6-legacy.zip
index ae47986de..fa0acac52 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.7-compact.zip
index 60b94ffd4..c4d1cc6a0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.7-legacy.zip
index 43e1d5c1e..513b64e67 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.8-compact.zip
index d6eea798f..b6987d8cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.8-legacy.zip
index 22734fa82..4fa71734a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.9-compact.zip
index e48d53605..cf126736d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.9-legacy.zip
index 95a81c8dc..9c4052a7a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.0-compact.zip
index 6f56b827f..8b70f0669 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.0-legacy.zip
index c64e0aa1f..264647c48 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.1-compact.zip
index bebc882c5..fa8793eb3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.1-legacy.zip
index da62b1d59..873e053fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.10-compact.zip
index 1e5f49ee8..3de112e6d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.10-legacy.zip
index 35a832b8f..71afb5408 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.11-compact.zip
index 25ff3919c..a249aaa07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.11-legacy.zip
index 036348b6e..21a99167f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.12-compact.zip
index 5b7bbcd46..93212854d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.12-legacy.zip
index 56e8a0f82..720b82829 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.2-compact.zip
index 412a16830..daa7344dc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.2-legacy.zip
index 87cb87989..4f48a9e69 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.3-compact.zip
index 6aa6f2b38..b8404eb87 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.3-legacy.zip
index 21abb682c..d7e7b9a28 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.4-compact.zip
index 0c3ed7a62..66618149f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.4-legacy.zip
index f302c6e62..5e3b357d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.5-compact.zip
index 351d8541e..d1a775897 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.5-legacy.zip
index 36631c74e..005d6ba7e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.6-compact.zip
index 66ff3a501..13acd647d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.6-legacy.zip
index 929209bec..75cc3316b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.7-compact.zip
index cd9ad2163..6a019a67b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.7-legacy.zip
index 801ec5515..f2f23f954 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.8-compact.zip
index cd144db54..f34e4d681 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.8-legacy.zip
index e8d6c05f7..32eb41a1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.9-compact.zip
index cf7f7b425..0a5d00117 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.9-legacy.zip
index 6fb50d3b5..b33896015 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.0-compact.zip
index b882088db..284af28cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.0-legacy.zip
index 1cabe8e1f..b566e54fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.1-compact.zip
index 861a0594a..144cfdeda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.1-legacy.zip
index 068991429..65799b306 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.2-compact.zip
index 0fd29e146..7c9c699dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.2-legacy.zip
index 8f4563aa1..19bf91f68 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.3-compact.zip
index 75fc8e023..dc9cc4977 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.3-legacy.zip
index 61fcf0157..51219e862 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.4-compact.zip
index 99817379b..651a06a8c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.4-legacy.zip
index 5375c5d3b..3820c69b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.5-compact.zip
index 54cda1817..1dbb3d7d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.5-legacy.zip
index 4eafcdef3..44609805e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.6-compact.zip
index e556e6768..af6bf1770 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.6-legacy.zip
index 7da377feb..321749be8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.0-compact.zip
index 8f6dbafae..ba927b6ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.1-compact.zip
index 3a18d5db1..01cb6dafd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.10-compact.zip
index 4171f7829..afd6dda78 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.11-compact.zip
index e26de18a4..c051d6a18 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.12-compact.zip
index 0f47f52c0..75a4e7551 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.13-compact.zip
index 6416b40fc..aca5c9f73 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.14-compact.zip
index 80f7e0ea8..ed945633c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.15-compact.zip
index 5140c6dcc..a509fa9d6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.2-compact.zip
index d9b48ccee..96e24b4ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.3-compact.zip
index 9abc17b50..cea7f338a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.4-compact.zip
index 5e25b55fb..4b96305a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.5-compact.zip
index a83cdcbfa..2a6d8eef9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.6-compact.zip
index bd0616f94..d717b0ef7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.7-compact.zip
index aaf8a02ba..82a8f1a7f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.8-compact.zip
index 76252f3ab..e2dd30377 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.9-compact.zip
index b49298307..bef97ce8b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/return-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.0-legacy.zip
index 6b4e8bd0b..10af09f7e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.1-legacy.zip
index b362fa67a..7400ded17 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.10-legacy.zip
index c4f113add..c934b9e41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.11-legacy.zip
index fcf013d55..0f0c52a5a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.12-compact.zip
index ca8bb6a1e..9579a6b16 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.12-legacy.zip
index ba97641b4..cc8f064c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.13-compact.zip
index 7263763c5..e19bdecb1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.13-legacy.zip
index fced2f016..9d4cb63aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.14-compact.zip
index 3640de814..be10ab00d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.14-legacy.zip
index 4cc7c0d58..9c2053936 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.15-compact.zip
index 08dffd1eb..76e687064 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.15-legacy.zip
index 9ad676c7d..173a5c364 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.16-compact.zip
index 95361dd87..4e18d9927 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.16-legacy.zip
index 5aa829576..fe6a36298 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.17-compact.zip
index 3ee806282..f2e93caca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.17-legacy.zip
index fe2d71c45..3d76a8422 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.18-compact.zip
index bfba9f426..416a3ac63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.18-legacy.zip
index 82cbd65d4..31c387600 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.19-compact.zip
index ec1b9cc36..241559e9b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.19-legacy.zip
index 4d4a77765..47379678d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.2-legacy.zip
index cd16385e4..7dd2981c3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.20-compact.zip
index 37712ba6b..e5f223b09 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.20-legacy.zip
index c3e067afd..07e1f8e4a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.21-compact.zip
index 4d046f467..50c043bbe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.21-legacy.zip
index d4fbf4ac9..5f38f95f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.22-compact.zip
index 6b2c7e270..9a6e0eeb9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.22-legacy.zip
index b06afb756..5be8f3428 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.23-compact.zip
index 4cdf0caa0..29885c9da 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.23-legacy.zip
index b179278d6..b5a1e866f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.24-compact.zip
index c78a1f81f..a576a55c8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.24-legacy.zip
index e6cfc56b4..a2fe5ae9f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.25-compact.zip
index f756e5806..d1fc950ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.25-legacy.zip
index 160255b9a..41917bfad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.26-compact.zip
index 591b568e2..d5e6ec28c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.26-legacy.zip
index 2b4f637ed..9eced6ed9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.3-legacy.zip
index e2f2c64cf..291f6c2a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.4-legacy.zip
index 099a8ba5d..eaecbd9f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.5-legacy.zip
index e690133c9..850b3e452 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.6-legacy.zip
index c8d49dab8..4b0ddca54 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.7-legacy.zip
index 4748831dd..32969c901 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.8-legacy.zip
index b0dae5810..4c9089133 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.9-legacy.zip
index f3952a39c..112bec90c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.0-compact.zip
index 12e644e3c..2f774546b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.0-legacy.zip
index 1f84f40e5..56c653278 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.1-compact.zip
index a01539613..b72b1bb82 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.1-legacy.zip
index c570ec690..fb2a9cae4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.10-compact.zip
index b8d93079a..53f76d670 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.10-legacy.zip
index 78cea32b0..0e1296086 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.11-compact.zip
index f32b44af1..1d5068352 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.11-legacy.zip
index 5d5422dd9..8eab37abd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.12-compact.zip
index 39af4e2e3..9b77c69e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.12-legacy.zip
index 8bf53a7db..c274ce6cc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.13-compact.zip
index 0fc6b70a2..1485be513 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.13-legacy.zip
index 491bba9b7..3b7ff8d8f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.14-compact.zip
index 80644ddea..16bbb0eaa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.14-legacy.zip
index 1d97d9c6b..5fa044151 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.15-compact.zip
index 55624bfb3..bcc8b554c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.15-legacy.zip
index 0e81fa65e..3a225c0a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.16-compact.zip
index e520ade36..5cb19240a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.16-legacy.zip
index 55eee1398..9c43eefe9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.17-compact.zip
index 8f43357b2..d26854a43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.17-legacy.zip
index a49f8cb07..5bf2fb3c8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.2-compact.zip
index 1de0f14f1..2cf848064 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.2-legacy.zip
index 52ddaf2a6..29abffeff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.3-compact.zip
index f22e81425..9a87df2ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.3-legacy.zip
index f4460ee33..74d8249c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.4-compact.zip
index 59b73f7ba..0b75031f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.4-legacy.zip
index e7fe57539..9497d973c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.5-compact.zip
index 6c6e500b8..d1b6426a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.5-legacy.zip
index 1709ad75a..3aa3e4113 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.6-compact.zip
index f8e43a85c..76825b9ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.6-legacy.zip
index 9bc29a9c3..74fcb4fcd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.7-compact.zip
index 42fb314c7..7c0367492 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.7-legacy.zip
index 58b58d196..eca47092b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.8-compact.zip
index 46f480115..f72b0d81d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.8-legacy.zip
index 7b1c6ee6e..cfc7d7d1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.9-compact.zip
index 679bb8d7f..6f9dfea63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.9-legacy.zip
index d8e9b5688..873225357 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.0-compact.zip
index 767ae7848..4d245f453 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.0-legacy.zip
index ea03c0ad7..d50bda783 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.1-compact.zip
index fa3768e9c..5a934ac4c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.1-legacy.zip
index e151a90db..ddc99bbf3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.10-compact.zip
index e202173bb..4850d82e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.10-legacy.zip
index b73785716..24ba67c84 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.11-compact.zip
index 6cf3f31da..b1ccce0cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.11-legacy.zip
index 66e8c3abb..d7611bd68 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.12-compact.zip
index 1a9165cf3..a1928464f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.12-legacy.zip
index b7c8ee1f4..199dbca3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.2-compact.zip
index dfdcbe33e..7659d7067 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.2-legacy.zip
index 17cccafc1..017f8774f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.3-compact.zip
index 062f5278e..c6adac657 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.3-legacy.zip
index 235ec9271..7e52deb60 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.4-compact.zip
index 85344703e..a07ae816c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.4-legacy.zip
index 3cf75249f..1ad49cf01 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.5-compact.zip
index 0593ac2f6..851eb6ae4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.5-legacy.zip
index c93bbc451..7da4d59cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.6-compact.zip
index 439cfdf65..1a905c7aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.6-legacy.zip
index f50b89985..cf949aec5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.7-compact.zip
index 2a1899902..ca90c5ff5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.7-legacy.zip
index 8475d24c5..f6e4ccd50 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.8-compact.zip
index 53a3f761d..cb24a2946 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.8-legacy.zip
index 65ecb1848..a65d5db1e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.9-compact.zip
index 9f502bb6c..1a87083d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.9-legacy.zip
index 99998e45e..eff77aa48 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.0-compact.zip
index ed199e29a..c58ae973e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.0-legacy.zip
index 42000ada1..42f088120 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.1-compact.zip
index ce863c64b..d94bcfbf8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.1-legacy.zip
index 32c9d4d50..ed1e1179a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.2-compact.zip
index fee9ea2e0..232302725 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.2-legacy.zip
index 16b7d8f9d..58ac126ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.3-compact.zip
index 97980e340..228921a50 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.3-legacy.zip
index 955b7ab92..3ba6b37e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.4-compact.zip
index 444483064..5ba451773 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.4-legacy.zip
index 549831535..7285a31b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.5-compact.zip
index 0c8b479f0..6c2646b50 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.5-legacy.zip
index 808eb6e17..e79474ddb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.6-compact.zip
index 56abd09b5..0d8d1800a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.6-legacy.zip
index 9cd78b2eb..f2824b858 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.0-compact.zip
index c089d493d..5a2b52538 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.1-compact.zip
index 924bdf929..65710fd5c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.10-compact.zip
index a2fd32c86..186673124 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.11-compact.zip
index 0c529fc24..d6b56c64d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.12-compact.zip
index 4e6c537f9..e6dcf56a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.13-compact.zip
index 137082108..db3f36e62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.14-compact.zip
index c7d44dedc..260e7c119 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.15-compact.zip
index 949a82255..35c3102b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.2-compact.zip
index 58da77aad..4e4ceafbd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.3-compact.zip
index 6c2625910..7d86df257 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.4-compact.zip
index cf5bdb71c..ef4cd67a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.5-compact.zip
index 95f953be7..8a4a3a9e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.6-compact.zip
index 784cb494c..2010608f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.7-compact.zip
index a1deff529..9c2ff6cf0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.8-compact.zip
index 1881e87ff..cac45712e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.9-compact.zip
index b13049ac4..04df5e424 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/scope-0.5.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.0-legacy.zip
index 7337a61bc..5a6abd0bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.1-legacy.zip
index 734cf266e..b63da6b83 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.10-legacy.zip
index 30e46269d..5e691fc0b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.11-legacy.zip
index 9d9b261f5..2349ae231 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.12-compact.zip
index edf72c250..cd077ffb1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.12-legacy.zip
index ecf4061f5..5739dc139 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.13-compact.zip
index 053b59152..b789fe319 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.13-legacy.zip
index 16805dd8b..3c6a5f75e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.14-compact.zip
index 28aad5602..e54acc1a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.14-legacy.zip
index 46a3b91fa..d3d5a5cd4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.15-compact.zip
index 2daaa78e6..c62de8408 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.15-legacy.zip
index 3a9cef458..1bf5b9046 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.16-compact.zip
index 6648e7bce..1f4405db0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.16-legacy.zip
index fb1217ef0..33751367d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.17-compact.zip
index 3e5689bae..6ceda48ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.17-legacy.zip
index 2e87255b2..922be3bed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.18-compact.zip
index 024024037..82afe3622 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.18-legacy.zip
index abf290c1e..80d3ddfe9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.19-compact.zip
index 31443db7c..3721d296e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.19-legacy.zip
index df8a2157a..82da1d57b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.2-legacy.zip
index 1bea07776..abbe69480 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.20-compact.zip
index 96017b776..73e1160af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.20-legacy.zip
index 37cf3715b..08b733a46 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.21-compact.zip
index 561b68f12..47ea66286 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.21-legacy.zip
index 7922ba9ca..56980de0f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.22-compact.zip
index 87ca5a480..786d734ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.22-legacy.zip
index b17e5ffdb..b223b53ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.23-compact.zip
index 0efa636ff..ebebd8e1c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.23-legacy.zip
index 25a4f2c4b..d4afb0458 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.24-compact.zip
index b38cd2269..6aa7bb96d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.24-legacy.zip
index e5a65bc2e..d4e60447e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.25-compact.zip
index 2e01b79f9..00a487cc4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.25-legacy.zip
index 5138be23a..eba44c510 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.26-compact.zip
index 699526b2a..691ef49d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.26-legacy.zip
index a10919803..32d424a9f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.3-legacy.zip
index 228ac5230..f25f46605 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.4-legacy.zip
index c125d0670..acf672508 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.5-legacy.zip
index 9ac6b2dc4..9e9c8ac91 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.6-legacy.zip
index 59cbdcbb7..c29aa8d98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.7-legacy.zip
index 1036fc46a..0a0ad4a29 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.8-legacy.zip
index 5cfa2200a..539dba99a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.9-legacy.zip
index 72408f10e..8a36a33a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.0-compact.zip
index 491d594e9..a56c56c9c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.0-legacy.zip
index 4fd87eef7..ff6c51fd3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.1-compact.zip
index 99e38c274..7c1a1eaaa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.1-legacy.zip
index b285491b1..02449ff5f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.10-compact.zip
index 61f0f51ce..d0ae0cb9d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.10-legacy.zip
index 94ef6b79f..fcaa3e2eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.11-compact.zip
index 8d2d19767..891b0682c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.11-legacy.zip
index b99e55c92..c74e3b5eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.12-compact.zip
index f5403a2a8..a8e76425b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.12-legacy.zip
index 81cca3f8a..47fb7beb9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.13-compact.zip
index fb807d2f2..182cd5b79 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.13-legacy.zip
index 2923369b5..a26c48227 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.14-compact.zip
index e3dcee786..0e9837a06 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.14-legacy.zip
index 76a95a13f..7cd59524e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.15-compact.zip
index 21857a656..9dee2aca0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.15-legacy.zip
index 5e71d16a1..2dea2e12c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.16-compact.zip
index 2fc740a52..1bdcb815a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.16-legacy.zip
index df51f35b7..6a29c0fac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.17-compact.zip
index 0f0bcddbc..9c039982c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.17-legacy.zip
index b6b8401be..6bbcaf83a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.2-compact.zip
index 0eaf83d6e..224fa1481 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.2-legacy.zip
index d03db4d3e..31e7d3195 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.3-compact.zip
index 47aefea98..d2af37016 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.3-legacy.zip
index 94aaeb879..d2b5566ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.4-compact.zip
index e37286ae6..db099d3f2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.4-legacy.zip
index 840c9b5cd..ab9d1c23a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.5-compact.zip
index 7e8ca2784..a96614b27 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.5-legacy.zip
index df5c9f4e6..ed33b4a69 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.6-compact.zip
index 6e1be913b..5fffcd81c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.6-legacy.zip
index 403439eff..0a3444ac3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.7-compact.zip
index 9cb59eab2..c3107568b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.7-legacy.zip
index 86969a904..c72b0f03d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.8-compact.zip
index 5e9ccc63b..3739e4057 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.8-legacy.zip
index 0b122e6d9..e6fed8ba9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.9-compact.zip
index 15e0d7724..3e9441f74 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.9-legacy.zip
index bcc030151..cc42969e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.0-compact.zip
index 755c1f838..8c893c60e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.1-compact.zip
index ca13f1982..7b5baaf07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.10-compact.zip
index 3034ea698..88d4de2f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.11-compact.zip
index 38a2f4d82..8db0ec27f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.12-compact.zip
index aace62a1b..1183b094f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.2-compact.zip
index 51d676377..5b3b78268 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.3-compact.zip
index 7faca16ec..cef4037df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.4-compact.zip
index 12ebdbfb6..b54e6c130 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.5-compact.zip
index 6fe53e151..4b2175422 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.6-compact.zip
index a242ae50b..bffa86967 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.7-compact.zip
index ccbab9aaa..c951cc61e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.8-compact.zip
index 59dd16871..4e930b140 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.9-compact.zip
index 304ceb5b5..83bc1e06a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.0-compact.zip
index d1d55ef03..80e0cb6ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.1-compact.zip
index 48aff3b08..71c9b1c2a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.2-compact.zip
index 9f69cb553..260ee28ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.3-compact.zip
index 32ef457d9..59961611d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.4-compact.zip
index 160d65c8a..de2b3a24e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.5-compact.zip
index ddac51f9c..117802fb0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.6-compact.zip
index 4e5d033f7..7a4a50da0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.0-compact.zip
index a16be7b81..cf9697457 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.1-compact.zip
index 3d9f073a4..c6dd89a47 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.10-compact.zip
index 1857bfc7b..b16079c1c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.11-compact.zip
index aca052e6e..08617530d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.12-compact.zip
index 3c1fb651a..18d14a75f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.13-compact.zip
index cf71c5cec..a47c0b4b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.14-compact.zip
index 55eda1a92..1b2a9ed64 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.15-compact.zip
index 2d93f3613..86a041870 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.2-compact.zip
index e88298ad4..93b636a0c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.3-compact.zip
index c98a9e8d4..4a6bf036b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.4-compact.zip
index 5ea7f5eb0..c21a7db87 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.5-compact.zip
index 925befa07..adef9e994 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.6-compact.zip
index 2d211acbe..9cde938a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.7-compact.zip
index 60861c2e0..ae681cd89 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.8-compact.zip
index 0350c7b25..fab52be34 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.9-compact.zip
index 61eb83774..8f03ae659 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/struct-0.6.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/ternary-with-max.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/ternary-with-max.sol-0.8.15-compact.zip
index dc4cb99da..3f5daa047 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/ternary-with-max.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/ternary-with-max.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.0-legacy.zip
index 78ee7dc0c..38c104bd8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.1-legacy.zip
index 150a28a46..76f9ca5f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.10-legacy.zip
index 6fac016b7..c637b1951 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.11-legacy.zip
index 8577a2098..be3755c6e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.12-compact.zip
index 23deb1c39..22f47ce09 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.12-legacy.zip
index 1718066d6..ed4d16ad8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.13-compact.zip
index bf9b3b46c..afcdc0c7e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.13-legacy.zip
index af67fbcb8..561250cbd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.14-compact.zip
index 209142443..0d7d0c52d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.14-legacy.zip
index 481702d18..68d40e637 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.15-compact.zip
index df8edce8c..703209b38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.15-legacy.zip
index 843335cb2..c3a4dbfb9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.16-compact.zip
index a411eddc8..012a1116e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.16-legacy.zip
index 819eac827..d998867c2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.17-compact.zip
index 841ed19f8..c49a42576 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.17-legacy.zip
index 6b676a26f..1a869f3ea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.18-compact.zip
index 924f51754..ea3013584 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.18-legacy.zip
index de9290e42..9f49e5281 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.19-compact.zip
index 8fd0c978d..aa34a472f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.19-legacy.zip
index 880031dd8..eb56e1bdf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.2-legacy.zip
index f4757c0d1..d816b2e71 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.20-compact.zip
index 23c5ef2de..7a64f8423 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.20-legacy.zip
index d4791bb7e..8ce04f5b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.21-compact.zip
index 00acd0d63..93780b309 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.21-legacy.zip
index 956290992..2d5e38a7c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.22-compact.zip
index dce818090..2ae9ad9ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.22-legacy.zip
index c4893888f..b8d0a85a0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.23-compact.zip
index 9bec0328a..4bd02dd50 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.23-legacy.zip
index 4d50729b9..4aeded0d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.24-compact.zip
index bf8ef1b7b..9315b383c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.24-legacy.zip
index f663d9a50..238e224d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.25-compact.zip
index cdb49b546..443fe87b2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.25-legacy.zip
index 04861afb7..213a8657d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.26-compact.zip
index e89429345..97c916907 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.26-legacy.zip
index 9f0321b06..a5f010f19 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.3-legacy.zip
index 4491b160c..2de66c5d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.4-legacy.zip
index 8d979784e..f907dac11 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.5-legacy.zip
index aaa2db4ec..894684190 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.6-legacy.zip
index 569fdff46..49cb68bcd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.7-legacy.zip
index 053feb91c..eecf49d2e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.8-legacy.zip
index 4622265af..e17531a98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.9-legacy.zip
index 7e0720e1e..83bb3515f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.0-compact.zip
index a2f9aba24..fac430943 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.0-legacy.zip
index 0d6e5ec52..e4a8f2ff5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.1-compact.zip
index 6f321c0a1..46edb0698 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.1-legacy.zip
index ecab0f702..9e0c7042a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.10-compact.zip
index b9738bb91..35e7bd177 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.10-legacy.zip
index a6d3a97ca..6c5038ff8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.11-compact.zip
index df95a8589..5f11e0b3d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.11-legacy.zip
index ac85ce69e..b20497dad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.12-compact.zip
index d009910a9..6ca2308df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.12-legacy.zip
index 0236a81dd..98fd6edbc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.13-compact.zip
index 1d4d374ce..2afebacd0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.13-legacy.zip
index 6f4ae0bec..d0e9f952d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.14-compact.zip
index 6a9fd84ba..4dfe48f47 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.14-legacy.zip
index c5d59952d..a0ce14cd5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.15-compact.zip
index 141120903..0ee9fd0c2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.15-legacy.zip
index 5d11b6256..f12f425e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.16-compact.zip
index 2df82471d..fe6f22582 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.16-legacy.zip
index 9789ab8dd..7424335aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.17-compact.zip
index b986c92da..becc68052 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.17-legacy.zip
index e2bff282d..bfa437d90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.2-compact.zip
index f1f577c48..1551b760d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.2-legacy.zip
index 99e0d3686..94ba29931 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.3-compact.zip
index 8047adfc1..7440e7af3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.3-legacy.zip
index a39738ae3..d3c745c42 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.4-compact.zip
index a499144ec..8d54aad88 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.4-legacy.zip
index 925cb3519..b011ff9a1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.5-compact.zip
index 945066bfe..b97ce8582 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.5-legacy.zip
index b4fcd68e9..2f63ca272 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.6-compact.zip
index 31f8a5a31..11e9fe40f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.6-legacy.zip
index 78f6a5501..177ce0e19 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.7-compact.zip
index d1b3d78ee..e2ca874d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.7-legacy.zip
index 3cff3b94b..1bac76123 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.8-compact.zip
index f605092b3..7de04844a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.8-legacy.zip
index d3a534093..569f18854 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.9-compact.zip
index 80b7acc39..497aeff54 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.9-legacy.zip
index 3c1cae332..ee445476a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.0-compact.zip
index 6ccbf96a4..2ba06cc63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.0-legacy.zip
index 0f9efcc62..428613638 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.1-compact.zip
index 177544907..242efed71 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.1-legacy.zip
index 9d30a9749..de6b8e8a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.10-compact.zip
index 2ed43c2e5..a1d8da31f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.10-legacy.zip
index d5b55a042..dab67f74e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.11-compact.zip
index deb735e5f..b35d6e5ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.11-legacy.zip
index fb525f278..fc37ca0e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.12-compact.zip
index 1b2639a20..9dcd621b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.12-legacy.zip
index 432e34a4e..731d5e0dc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.2-compact.zip
index 9beb2b52e..db0328223 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.2-legacy.zip
index 4e30a5b63..e6e28e8d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.3-compact.zip
index 33cea2093..976142660 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.3-legacy.zip
index f17780ee4..9e92a9030 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.4-compact.zip
index e9ac5fc13..ac197da3a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.4-legacy.zip
index e5c83e6db..d38526f08 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.5-compact.zip
index 89b1f20a5..9518c1fa7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.5-legacy.zip
index c39a68e9c..6fbc1b179 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.6-compact.zip
index 03212483a..159522bab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.6-legacy.zip
index 69f1f430d..54093b852 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.7-compact.zip
index b319f7ec0..7e20bffa8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.7-legacy.zip
index 79fae8380..30be12bb4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.8-compact.zip
index c5e5bb734..6978cc4ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.8-legacy.zip
index 54c679e39..2433aac6d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.9-compact.zip
index 502a77e51..1aa051b70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.9-legacy.zip
index fa64dfaa4..0186ed882 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.0-compact.zip
index 3bfa263ec..7d7d26494 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.0-legacy.zip
index e6249090f..e1c5224a0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.1-compact.zip
index ca96a178c..c65d7dd74 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.1-legacy.zip
index 40588200a..baa7ea400 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.2-compact.zip
index 83d200659..b9b987b6e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.2-legacy.zip
index 7a1e4f4d3..6d438cbad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.3-compact.zip
index 045e4069a..9214adc86 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.3-legacy.zip
index adecb1f4f..ef0843ed7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.4-compact.zip
index a00c831fc..48349b0ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.4-legacy.zip
index 2e4b22d35..f4cfd75d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.5-compact.zip
index 612bca795..172e0d4f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.5-legacy.zip
index 6c9a36459..085af2bbd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.6-compact.zip
index 8a0788df2..8d88b49c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.6-legacy.zip
index 83e5a9228..33babb9b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.0-compact.zip
index bca07a7ce..d45a0653f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.1-compact.zip
index 48f20a39e..0a48e0c00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.10-compact.zip
index fbbb61901..5c6cdec48 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.11-compact.zip
index 27e468710..44dae2b53 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.12-compact.zip
index 9ca6fac1c..91a0ddbc6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.13-compact.zip
index 782b152fa..76abe141b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.14-compact.zip
index 69ebe019b..5ba7384ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.15-compact.zip
index 19b0b183a..ca338e4a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.2-compact.zip
index f6a452c06..dde6b6b63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.3-compact.zip
index be2da4dd6..ef68337f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.4-compact.zip
index 7717835cf..94d09dd98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.5-compact.zip
index defc92119..9c17b02e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.6-compact.zip
index f1e7b16c7..22f0f0934 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.7-compact.zip
index 03959428b..5e95ff947 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.8-compact.zip
index cf0dd80b8..83f882abf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.9-compact.zip
index 425420e28..c077acc76 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/throw-0.5.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.0-legacy.zip
index 41dde8916..40deedfe8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.1-legacy.zip
index 45076a87a..60adee63a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.10-legacy.zip
index f53e4f0fe..12f509164 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.11-legacy.zip
index 07b5ca475..208f0bbf2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.12-compact.zip
index ed8fa925e..953989a49 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.12-legacy.zip
index 30b6c8921..7b9c472a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.13-compact.zip
index 59ad2ebec..53ca6488f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.13-legacy.zip
index 3f3b9a38f..d835c0342 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.14-compact.zip
index 4b09e369a..1db1bb42e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.14-legacy.zip
index 099368174..bfee251ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.15-compact.zip
index ad896d087..e54d6d33e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.15-legacy.zip
index 8fd0f2c65..814e8c907 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.16-compact.zip
index e22c35b7c..3d67a1366 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.16-legacy.zip
index c80e12c8f..155a54d6d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.17-compact.zip
index 01eea6a46..4f10cc828 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.17-legacy.zip
index 961049ccf..5d49434d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.18-compact.zip
index 73bc69d4d..d959d0c08 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.18-legacy.zip
index a4520e4b6..71c4d8168 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.19-compact.zip
index 4b6f2018f..bbb09b5e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.19-legacy.zip
index cdb394787..107b32f2f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.2-legacy.zip
index ffee8a7e9..0b760483d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.20-compact.zip
index d23d50a0e..1f47a62c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.20-legacy.zip
index bb6c632c0..925d52c00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.21-compact.zip
index 90bb42797..a9f9a13b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.21-legacy.zip
index 1b69747c9..9b38ee0d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.22-compact.zip
index 0f3f5b99b..4c534a290 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.22-legacy.zip
index d606d71a4..ff195ce7c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.23-compact.zip
index 577d166b5..4d2b64d46 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.23-legacy.zip
index cfa7afb6d..a4f268146 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.24-compact.zip
index 998a47a8b..423e815cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.24-legacy.zip
index 26fb46483..e9add582d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.25-compact.zip
index c6f38b73a..e2864c18d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.25-legacy.zip
index a3e769365..4ed9fa4f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.26-compact.zip
index 3212096c2..4ad40ad45 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.26-legacy.zip
index 3e4d99ee1..c78949720 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.3-legacy.zip
index 3a5c04be4..a89c7199e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.4-legacy.zip
index 600edfb6f..e3ff59c8a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.5-legacy.zip
index 5231d4364..3fe73356c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.6-legacy.zip
index 13f7933e2..8f54c251b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.7-legacy.zip
index 275c7780a..6bc017b8e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.8-legacy.zip
index bc41a47e7..e087ec4e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.9-legacy.zip
index 18ba4c719..c02bc240e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.0-compact.zip
index 29b642311..b617b45b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.0-legacy.zip
index 6ff98660f..bc868f744 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.1-compact.zip
index 8cdcfacd1..fbf979e38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.1-legacy.zip
index fa2fd97df..d8a5f79ad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.10-compact.zip
index b37826ee2..c5601b5fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.10-legacy.zip
index 22c73ea75..8d1ad29b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.11-compact.zip
index 8001d5dba..854695950 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.11-legacy.zip
index 986c97948..0360ed1e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.12-compact.zip
index 3f12bfa34..e68a72a3b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.12-legacy.zip
index ea01a5f48..78ecfbd9d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.13-compact.zip
index 127da25a0..995726a61 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.13-legacy.zip
index 50bca56af..e019d8ccf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.14-compact.zip
index 74c3d6de7..9c754bc6c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.14-legacy.zip
index 752ae8570..6d65a71b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.15-compact.zip
index 7f172c421..9a5d8040c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.15-legacy.zip
index 0e8415457..cccae41d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.16-compact.zip
index 6790c7374..d3afc8637 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.16-legacy.zip
index 6369eca24..76b4a7b2f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.17-compact.zip
index 0d00ae4d6..8b9abccd0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.17-legacy.zip
index 565cecab9..514bd58ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.2-compact.zip
index bf387f47f..9c05be6ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.2-legacy.zip
index a55289f5b..e84bb18a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.3-compact.zip
index 99833582b..bcd3b4dc9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.3-legacy.zip
index b880d2244..2c7b069ea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.4-compact.zip
index 69634c61c..3b735499e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.4-legacy.zip
index dd3eee72a..963b8df8c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.5-compact.zip
index cd71f475a..67e70b98b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.5-legacy.zip
index e46269bc7..0985fb797 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.6-compact.zip
index 087757a1f..e273c052a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.6-legacy.zip
index 5295dda04..82309dd50 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.7-compact.zip
index 7ff3e2949..891f598b2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.7-legacy.zip
index e1461d4dd..cd0821ef6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.8-compact.zip
index 55ac14491..3db29d8f0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.8-legacy.zip
index 704606a6b..6e6ab6e8d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.9-compact.zip
index 20b6f1d8a..10812c188 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.9-legacy.zip
index 6b18c016a..b24f4b3c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.0-compact.zip
index 37d0a7224..63e95e715 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.0-legacy.zip
index 795ab590e..035482ec1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.1-compact.zip
index 0c2f20f21..3b8256255 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.1-legacy.zip
index a39fc14d5..2f995da6c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.10-compact.zip
index c74855537..d623e95db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.10-legacy.zip
index 616cc069e..5053b4402 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.11-compact.zip
index f49f32577..e2d4e3d2c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.11-legacy.zip
index 6b2454ce6..247dcb7b7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.12-compact.zip
index 6ed7b5cc2..949a4764c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.12-legacy.zip
index c43ebe3f9..810a09ab0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.2-compact.zip
index a83a32b1f..65baacf3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.2-legacy.zip
index ac3216e61..75eebb74f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.3-compact.zip
index df010fae9..b29d18bd0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.3-legacy.zip
index 4b956260e..ebce87072 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.4-compact.zip
index ee0341de5..8cd22bdf4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.4-legacy.zip
index ec3aff4f7..4d166062d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.5-compact.zip
index d8769bd1d..0d539c6d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.5-legacy.zip
index 2cc2856a6..33e531efc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.6-compact.zip
index ec5ee11de..35f377e51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.6-legacy.zip
index 2d9cede22..c2e3eebb9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.7-compact.zip
index dd7d8d7c1..44d20257e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.7-legacy.zip
index 6a01adb22..9012949b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.8-compact.zip
index 416ff607d..6be357538 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.8-legacy.zip
index fff8df655..3ce9bbe0e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.9-compact.zip
index 69acb665a..55f7854fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.9-legacy.zip
index 1923ac163..f0e8e331e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.7.0-compact.zip
index 300c2e111..cb46f5558 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.7.0-legacy.zip
index 8782acac5..8675faa2e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.4.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.1-compact.zip
index aba4337dd..bad4f8008 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.1-legacy.zip
index 3d203dcce..cd8f62c32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.2-compact.zip
index b04f5eb14..056045e50 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.2-legacy.zip
index ad27e68d5..7bf34665b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.3-compact.zip
index 2e68705de..4753b8fbb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.3-legacy.zip
index 2ce542c0f..0cad6b796 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.1.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.4-compact.zip
index 06dce1277..61e254c65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.4-legacy.zip
index 53c60fed8..f08266ae2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.5-compact.zip
index 58ef911fd..6815ec78a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.5-legacy.zip
index 48591cc4b..e2b864eb1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.6-compact.zip
index 3a91407be..80cce7cd1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.6-legacy.zip
index 8cbf37235..218bf52b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.0-compact.zip
index 710ce5c7c..33a1dcee1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.1-compact.zip
index 632b2c4c8..1e93feff6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.10-compact.zip
index a933ef345..0f1a91471 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.11-compact.zip
index 47157b372..82c900f71 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.12-compact.zip
index 048cd9d30..759fcfe8e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.13-compact.zip
index b52cd422b..6371afb32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.14-compact.zip
index 7900e8f7c..a9a9a59b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.15-compact.zip
index 417dd85a6..432d9202c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.2-compact.zip
index fabf71960..4691f9741 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.3-compact.zip
index ba8edad6f..42b04ddcc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.4-compact.zip
index f8bfe662b..0e9f34edd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.5-compact.zip
index 13961d3a8..72c94943e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.6-compact.zip
index 09d1bfafb..8e2d32069 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.7-compact.zip
index d6a2ec0df..a71e9835c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.8-compact.zip
index 7c0f2cc0f..38f73befd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.9-compact.zip
index 05a318e35..e6387ab1c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-0.7.4.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.0-legacy.zip
index 9fc3085d7..6da5fe412 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.1-legacy.zip
index 8c0a0f5ca..80f97ccee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.10-legacy.zip
index 10e33c0c5..305c210f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.11-legacy.zip
index 4f7ef00fb..dd84ff7a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.12-compact.zip
index 8004dd0b8..e38889f93 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.12-legacy.zip
index 2262f75ef..6cd7dc207 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.13-compact.zip
index 7748e0910..f2f9cbef3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.13-legacy.zip
index c07f6948a..c0786cf91 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.14-compact.zip
index 33cde6959..6ef662d0a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.14-legacy.zip
index 8590af5d1..0983554a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.15-compact.zip
index d31e83e2e..f1a7331e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.15-legacy.zip
index b35cc7fb1..0aefc795c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.16-compact.zip
index 242cab3e1..127452917 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.16-legacy.zip
index 8fb57f6ee..1a4c5d2de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.17-compact.zip
index 801edd806..180e2877f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.17-legacy.zip
index 152c90a50..55a8fcb91 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.18-compact.zip
index fb9c6c60e..99c528ab3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.18-legacy.zip
index d64bac087..ef971e639 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.19-compact.zip
index cb70f90c7..bb3f2d59c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.19-legacy.zip
index 4f8c32106..bdae87bb7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.2-legacy.zip
index 32af2180e..38ce557ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.20-compact.zip
index 2b3a82c80..ab16cd3a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.20-legacy.zip
index 4d3f84a75..50a6c7c92 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.21-compact.zip
index 3e3b6a695..07ca8e6ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.21-legacy.zip
index 668f18fa9..4c59148d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.22-compact.zip
index 57e16e796..5fb555b9a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.22-legacy.zip
index d4cc92c9c..3a41a246b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.23-compact.zip
index f83731f7e..4940fa802 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.23-legacy.zip
index 3438e0310..1bf236f8e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.24-compact.zip
index 0ecebd6a4..0d4913e75 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.24-legacy.zip
index 6c7b80bf2..a344b5b8c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.25-compact.zip
index 0d7540ef2..b02099985 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.25-legacy.zip
index 9d4065d26..cab8c4dd6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.26-compact.zip
index aab8f09c7..ce091c441 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.26-legacy.zip
index e38bc9984..65d1f546f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.3-legacy.zip
index da9a7af5e..6c5467652 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.4-legacy.zip
index 1d3732b3f..fad0a7b31 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.5-legacy.zip
index 0e573c6fa..5aef07f68 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.6-legacy.zip
index 757b5d850..6f668b6f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.7-legacy.zip
index b5d505dcb..a92319842 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.8-legacy.zip
index 7cdd94bf8..d563047c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.9-legacy.zip
index 0f500e3ff..e88d829bc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.0-compact.zip
index 2629e9c12..0d7a4c736 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.0-legacy.zip
index 3d055b74a..0146a1072 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.1-compact.zip
index 3ff0efcfb..127574c32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.1-legacy.zip
index 05be336aa..206a837d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.10-compact.zip
index 93474dd7a..6d99f2596 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.10-legacy.zip
index bb9a8bb47..56f945b24 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.11-compact.zip
index 95fda7834..8d1eff911 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.11-legacy.zip
index 92c1b2c78..6d6878d67 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.12-compact.zip
index 6e4c7d11e..6b34c0123 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.12-legacy.zip
index b51de2edc..51f8e53d8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.13-compact.zip
index 5596466ad..73a02ccdd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.13-legacy.zip
index 4fbcff660..5356828e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.14-compact.zip
index bf60d15a6..eaa657db7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.14-legacy.zip
index 54ed67745..6c93170ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.15-compact.zip
index 963c5db72..7add73eb4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.15-legacy.zip
index 7668f45ef..642206056 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.16-compact.zip
index 1659bb1fb..fb31d95da 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.16-legacy.zip
index 69cbb3d9e..23821c59d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.17-compact.zip
index 1ece55db0..3ab2f8402 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.17-legacy.zip
index bb97fe283..35b65760c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.2-compact.zip
index 656853308..1cd072c71 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.2-legacy.zip
index 5fce80472..acf57e4e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.3-compact.zip
index 779997bb5..223a33d35 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.3-legacy.zip
index 9c0ef3e85..85a7f5eff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.4-compact.zip
index af0500075..654676356 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.4-legacy.zip
index 3abbd8029..c1e11e4a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.5-compact.zip
index e5bfe079a..7563f6d47 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.5-legacy.zip
index 71e01d561..10d8ecf57 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.6-compact.zip
index 919bd4ebc..a841e886f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.6-legacy.zip
index bac8abd6a..1e00f2eaf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.7-compact.zip
index 2da511169..8e8fc5bba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.7-legacy.zip
index 48688619f..c01da6734 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.8-compact.zip
index 64ba11e0b..9116d2a08 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.8-legacy.zip
index d9f18e2e4..aa864af29 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.9-compact.zip
index 90027c334..12a44f69a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.9-legacy.zip
index 7e7058322..07f01c7aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.0-compact.zip
index 110125afb..b304a4144 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.0-legacy.zip
index f8ced13e2..2a844cfbc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.1-compact.zip
index 86a22c2a8..68efd60eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.1-legacy.zip
index 9f0ec594b..2ac9fc02d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.10-compact.zip
index a9bd62439..5e85e44a0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.10-legacy.zip
index ed88c1243..40ad0338d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.11-compact.zip
index 9fa274cf8..f300bec62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.11-legacy.zip
index f1917e8bc..562583ceb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.12-compact.zip
index fe4db05b3..e85ac431b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.12-legacy.zip
index 00ae497f7..dbf68ddc5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.2-compact.zip
index 61cac5261..f0145bfd2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.2-legacy.zip
index 0069b1a1c..347579340 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.3-compact.zip
index 12975e458..1353b1cbf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.3-legacy.zip
index 09f4cd854..478244ea9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.4-compact.zip
index 9663489cf..80a418717 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.4-legacy.zip
index af973b34d..1ad2401ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.5-compact.zip
index d80ae6f7c..5c6595c2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.5-legacy.zip
index 6776e9292..01e24695a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.6-compact.zip
index d6bf16003..e78b82d8d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.6-legacy.zip
index d45ce1d60..5ba067982 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.7-compact.zip
index 723eed89a..1f451e4bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.7-legacy.zip
index 8eba66a0d..e57ad1fd4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.8-compact.zip
index 9b71a7dfb..3ef93bd56 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.8-legacy.zip
index e5874c039..65defab38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.9-compact.zip
index 20bbeebf3..809f0027f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.9-legacy.zip
index 15979cfed..e5a6efbbe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.7.0-compact.zip
index c8a0976d3..bc9f6a324 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.7.0-legacy.zip
index 695cc9b4d..60e3f5d7f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.4.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.1-compact.zip
index 2c61bc523..ca4938d26 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.1-legacy.zip
index 0e6bfb182..33d781b23 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.2-compact.zip
index 9809441b0..c99484e2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.2-legacy.zip
index 9d3551274..1c205e3dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.3-compact.zip
index 3e15f766d..beb7c1efd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.3-legacy.zip
index 8285761c6..e4f3fd58c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.4-compact.zip
index e6812874c..6292d6afb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.4-legacy.zip
index d8dccd987..e852a58b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.5-compact.zip
index f02428732..477f886d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.5-legacy.zip
index e6e531895..b18182afe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.6-compact.zip
index 65b1f4835..fb0a03544 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.6-legacy.zip
index c74b20fbb..ea820a9e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.0-compact.zip
index ea5db6c2a..644f51930 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.1-compact.zip
index bafbd90d9..7e1fab179 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.10-compact.zip
index 2c9420c61..d63ba382a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.11-compact.zip
index 1971a9ac6..e8e4d5808 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.12-compact.zip
index 3e36d11df..a4dc0fa7e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.13-compact.zip
index e8e2147cd..87a111014 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.14-compact.zip
index 73779b9a0..0aa33dd54 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.15-compact.zip
index 39c85beb3..02119a7c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.2-compact.zip
index ccbaae0c7..9a489d789 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.3-compact.zip
index 0ca1f6849..2873fab15 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.4-compact.zip
index a2c9e4505..f6ed71aad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.5-compact.zip
index 7cd5d002f..ba8d78a08 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.6-compact.zip
index 8b3ccd949..4d537aca0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.7-compact.zip
index 1eb247e8b..85606dd9a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.8-compact.zip
index 1215e2d2c..267a5c52c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.9-compact.zip
index 8204dc06c..208dad4ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-0.7.1.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.0-legacy.zip
index 22dc4f1b6..fda04bad4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.1-legacy.zip
index ad5683899..a7b51925f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.10-legacy.zip
index 4d9d94a8f..d7409dcd4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.11-legacy.zip
index ad61556bd..8095138b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.12-compact.zip
index a45121c5d..e3af9f922 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.12-legacy.zip
index 76d37562e..d25cd3f23 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.13-compact.zip
index ba46347b9..439c98254 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.13-legacy.zip
index 9bc4db03b..ceffa3eab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.14-compact.zip
index 70b8c314e..b287bcf28 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.14-legacy.zip
index 78fb2cbb1..1e0aede05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.15-compact.zip
index 697ba35b1..8c3b1e9bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.15-legacy.zip
index 25f873154..5891b3864 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.16-compact.zip
index fdd3f8b4a..e0c88b507 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.16-legacy.zip
index 56442b7af..ab6bb791e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.17-compact.zip
index 72b5f7074..d0fb6ec05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.17-legacy.zip
index 2328197f4..4448bac42 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.18-compact.zip
index 79e9b4b12..e51eab208 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.18-legacy.zip
index 6438fbba7..927f82bea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.19-compact.zip
index b3e97f359..0b06c73c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.19-legacy.zip
index 677b43838..d8c354555 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.2-legacy.zip
index 3a48f7e06..fb14cd03d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.20-compact.zip
index b009b71c5..e1969f11d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.20-legacy.zip
index 307109757..a53480f66 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.21-compact.zip
index af7163c6e..2b68da80c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.21-legacy.zip
index d60b6a5d5..b41ddf01a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.22-compact.zip
index 939ee5ed6..52fafca51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.22-legacy.zip
index 79f8eb6c0..d6ac19908 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.23-compact.zip
index bc9b2dded..da2388c43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.23-legacy.zip
index e77fd0a77..5bcd6dc46 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.24-compact.zip
index 538edb3a4..c2e65e704 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.24-legacy.zip
index 8c8d633e8..a1b3699a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.25-compact.zip
index 02af3ebfd..f00f6848c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.25-legacy.zip
index 704f2dde6..228496ac9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.26-compact.zip
index 6e98716dc..e356e6262 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.26-legacy.zip
index f739db53b..aecaa7694 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.3-legacy.zip
index dd30de79e..728373327 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.4-legacy.zip
index f4aac5068..cfc22087c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.5-legacy.zip
index 3923c390a..deb6438b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.6-legacy.zip
index cd18605bc..98a9e077b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.7-legacy.zip
index 284681115..483c9191f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.8-legacy.zip
index 0b1380cca..470b28700 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.9-legacy.zip
index a43bea74c..22c9651d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.0-compact.zip
index deea829fe..60d69267f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.0-legacy.zip
index d0878f604..b9746cff2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.1-compact.zip
index b35843555..da667340e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.1-legacy.zip
index a0dc3fe7f..437101a4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.10-compact.zip
index 97ea6ed17..377a20fad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.10-legacy.zip
index d8769a53a..5fc0976ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.11-compact.zip
index cf633d98d..ec5112303 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.11-legacy.zip
index 3f52ac490..4294e5240 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.12-compact.zip
index 5439bd5fe..c1dabf038 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.12-legacy.zip
index 1a88879c7..2f4dfde59 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.13-compact.zip
index 31cd1f4d3..683ffcaff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.13-legacy.zip
index 8f21dc748..840a3228a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.14-compact.zip
index e3ea97c09..349c88839 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.14-legacy.zip
index ef34b39a3..a726a3098 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.15-compact.zip
index 61a5b97f8..fe8dab3ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.15-legacy.zip
index 87ffafa3b..46fca705b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.16-compact.zip
index 65ebf2116..eede5eb70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.16-legacy.zip
index be313b2f3..eda99b91c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.17-compact.zip
index 135647cbd..41df9e02a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.17-legacy.zip
index cd51b8ae4..7e7c4bed1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.2-compact.zip
index 8551f5282..e91430d68 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.2-legacy.zip
index 1ad0ec248..a493d3a03 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.3-compact.zip
index e2cbc6889..dbef02f82 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.3-legacy.zip
index 0467511de..7d90d1d7b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.4-compact.zip
index c41ddc940..79a3cffd1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.4-legacy.zip
index d679afc7a..64c16b5b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.5-compact.zip
index c80e82d0d..3b60af6ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.5-legacy.zip
index 7f7d99e89..7288740b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.6-compact.zip
index 3bd2a0c19..585ec51a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.6-legacy.zip
index 339a6f0f5..ae2443ec4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.7-compact.zip
index 500120756..3c229572f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.7-legacy.zip
index 6c485334d..944f2109f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.8-compact.zip
index 9594e151d..5f92b0a63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.8-legacy.zip
index 793291b3d..324b92e4c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.9-compact.zip
index 9adbcfca5..3434fdb64 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.9-legacy.zip
index 55b9cd125..7f79aa4e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.0-compact.zip
index 123e8c0ab..069fffd9a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.0-legacy.zip
index fc7e1ffd1..a62681d59 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.1-compact.zip
index bbac2fe4b..aaa379ebb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.1-legacy.zip
index 06cee392d..fda5b3333 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.10-compact.zip
index 3a708b897..ed365f3a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.10-legacy.zip
index 42163fb20..6dbabe529 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.11-compact.zip
index 7edfff7cc..a74dec250 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.11-legacy.zip
index df845130c..be8828aa7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.12-compact.zip
index 193ef508f..d4800f483 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.12-legacy.zip
index 2546218d2..34ecdee6c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.2-compact.zip
index 896dd91cf..e8841ecef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.2-legacy.zip
index 4418cb2b3..fdfa05220 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.3-compact.zip
index baa978a21..cece1bbe2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.3-legacy.zip
index 7d3eab4d5..be2d1baaa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.4-compact.zip
index 5213c64d4..2ab3a5128 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.4-legacy.zip
index d35a46f21..2a747d19c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.5-compact.zip
index 4f42dd7c6..75e99db5e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.5-legacy.zip
index d878ae50a..61ecf73d9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.6-compact.zip
index 68ee53628..e42e3198f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.6-legacy.zip
index 48f74bcb1..a94fe9ada 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.7-compact.zip
index 7ac4c499e..ef581b752 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.7-legacy.zip
index b31222c7b..f25d058d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.8-compact.zip
index 3e402a11c..364922274 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.8-legacy.zip
index 19c95ac4c..87f004a53 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.9-compact.zip
index 5e9306e22..19474eaae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.9-legacy.zip
index 337ea231d..70863ec40 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.7.0-compact.zip
index 4fc27bd3d..e9063a927 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.7.0-legacy.zip
index 7cc079aae..202dc2377 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.4.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.1-compact.zip
index 8278fcb36..0ecae1dbe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.1-legacy.zip
index 794775ff3..3d52fcb38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.2-compact.zip
index 0d739059e..0ae557505 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.2-legacy.zip
index 3f2011a41..4f31e154e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.3-compact.zip
index 962a0d8c0..4d0d87188 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.3-legacy.zip
index eee1bfa1b..f7d30c57c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.4-compact.zip
index 2ff14e7cc..6e4a911e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.4-legacy.zip
index 9f9e089f1..09ddf076b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.5-compact.zip
index e1b4fab6b..b83b0c484 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.5-legacy.zip
index bd88fc9c6..5735bb505 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.6-compact.zip
index aec9fbb29..cf80ad5de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.6-legacy.zip
index 0e9dba8e2..9653282c6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.0-compact.zip
index 383a56164..2821b77df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.1-compact.zip
index b71fb9919..90c8368c2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.10-compact.zip
index b7aca3dba..ec81c3be5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.11-compact.zip
index 9435287a8..49f1a3aaf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.12-compact.zip
index cb7b4e1ab..c70e8f904 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.13-compact.zip
index 9db0ebf8c..7772cce3a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.14-compact.zip
index 8d24a1e66..2be5ad76e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.15-compact.zip
index 48a253f3d..1803e9faf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.2-compact.zip
index 3b525cbcd..a4f887359 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.3-compact.zip
index 89df52c83..94fe74feb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.4-compact.zip
index a39fba802..51f857120 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.5-compact.zip
index 9d2745cfd..e2ab10d13 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.6-compact.zip
index b3c7f2fec..67643a679 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.7-compact.zip
index 880c7d4a3..d8b6bd3b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.8-compact.zip
index cdf9af3eb..2a4cc78b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.9-compact.zip
index cc8418d1d..cde1a509f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-import-bis-0.7.1.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.0-legacy.zip
index 057f2b769..517b93ad8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.1-legacy.zip
index d1ccc50c7..d6e41497d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.10-legacy.zip
index 8e8f8731a..08e957ce0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.11-legacy.zip
index e639e843b..37a0e3c35 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.12-compact.zip
index fd1b2a761..ad485e5bd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.12-legacy.zip
index 8af568ab2..1b990c494 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.13-compact.zip
index d6f452e5c..09991e5af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.13-legacy.zip
index a1a499cf3..57a24b6c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.14-compact.zip
index 6530c5f2b..105a0735c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.14-legacy.zip
index 667751d04..1c2832fe4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.15-compact.zip
index dcaa13ca3..ea2d77001 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.15-legacy.zip
index 650c35c2f..b2b59a989 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.16-compact.zip
index ef507f45f..fc3ff3ca1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.16-legacy.zip
index e02d86f96..f49a4c230 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.17-compact.zip
index 2c845acac..7a242247f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.17-legacy.zip
index b15641e12..31d940a31 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.18-compact.zip
index 541460a7d..74f5576ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.18-legacy.zip
index cb5016edf..5a2ae0f2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.19-compact.zip
index dc047e123..0bda0e8c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.19-legacy.zip
index e36c8e897..0a29efb42 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.2-legacy.zip
index 1cd35b3dc..c89073e28 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.20-compact.zip
index c3a2dffdb..2377f58b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.20-legacy.zip
index e9a37e5b3..47569b973 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.21-compact.zip
index 912922428..d307cd137 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.21-legacy.zip
index 692b00d52..16af62cad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.22-compact.zip
index 077a4668a..643f5f778 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.22-legacy.zip
index 26938a46a..4cce168c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.23-compact.zip
index a7bec3b8d..f05b7fadf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.23-legacy.zip
index 455d059d3..4dd0bfce7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.24-compact.zip
index bbe80c4bd..34b860b2f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.24-legacy.zip
index 3d3186501..2184f300c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.25-compact.zip
index 43dd65949..f9f68262d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.25-legacy.zip
index 3d60284d5..40a86dcc6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.26-compact.zip
index baaf77627..e121e67b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.26-legacy.zip
index 3ce6f8ce7..fb87bd96b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.3-legacy.zip
index c42d4bc51..473c6979b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.4-legacy.zip
index 9a4ea5196..a73747d98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.5-legacy.zip
index ace770ee0..faf797357 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.6-legacy.zip
index bb00ec442..d2799fa82 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.7-legacy.zip
index d6495eeaa..d32c1ac30 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.8-legacy.zip
index ff41143de..4fe143fd5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.9-legacy.zip
index a7e94c469..a99e072b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.0-compact.zip
index 5e160852a..343ca220f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.0-legacy.zip
index 1578fcae2..640138525 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.1-compact.zip
index 63b41316b..2c3d3a5a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.1-legacy.zip
index e9fe49b5e..5563a484d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.10-compact.zip
index 6a9ae686c..7db1df393 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.10-legacy.zip
index 47de0af28..90862f708 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.11-compact.zip
index dca0524fc..d4b6b0041 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.11-legacy.zip
index 5022fac18..e9ee681b2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.12-compact.zip
index 4b8d08508..057b121e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.12-legacy.zip
index 348eca091..5af636ea9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.13-compact.zip
index 1df235489..9250bc2f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.13-legacy.zip
index 203202457..4dcb805bd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.14-compact.zip
index 87ee74620..5b66613a0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.14-legacy.zip
index 511def13d..cc6b7bcec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.15-compact.zip
index 23c15cbd7..59b07f0b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.15-legacy.zip
index abe253ece..27502a6eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.16-compact.zip
index aa398c716..d8e92f5c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.16-legacy.zip
index 654bab32b..6c1501134 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.17-compact.zip
index f2a2297bb..9eeb38e00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.17-legacy.zip
index 99df2dd26..2c8f87de3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.2-compact.zip
index 80011d553..23ea36558 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.2-legacy.zip
index 444555762..b70451f54 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.3-compact.zip
index 9ee127f25..ed1b01376 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.3-legacy.zip
index 5c87f743d..3607a7c5d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.4-compact.zip
index 8a660bb72..9bafff51f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.4-legacy.zip
index 9ec2d5bcd..a5a2865d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.5-compact.zip
index 27425b989..80516568c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.5-legacy.zip
index 25835d8a1..1960dab35 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.6-compact.zip
index 4fc3a23d7..df7c27487 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.6-legacy.zip
index fd03dfcce..9d2e55aca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.7-compact.zip
index 9ec5f85e7..2eef5f66c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.7-legacy.zip
index 7485533af..d9aa13db5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.8-compact.zip
index 016c6475b..c858087a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.8-legacy.zip
index 0d46be0a0..186c8908e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.9-compact.zip
index 9bcabec00..00ab5a5df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.9-legacy.zip
index 8a78047e9..f6c90d14a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.0-compact.zip
index 6755487d6..1025a6a03 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.0-legacy.zip
index 6e6bb5a90..c12eaa7b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.1-compact.zip
index 3b89f0091..9ad29f995 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.1-legacy.zip
index 612d59ad0..51c440a59 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.10-compact.zip
index fa290fe45..4a7e06c43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.10-legacy.zip
index 538b1a937..26d3dd19f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.11-compact.zip
index 9162a5315..9eb9f1af0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.11-legacy.zip
index 209f151ef..9b8bb1ae5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.12-compact.zip
index 0410b6ecb..a7a26c081 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.12-legacy.zip
index 522c21c4b..925b88d6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.2-compact.zip
index c25fcccc7..5536bbf72 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.2-legacy.zip
index df14a76f9..b2ac61e77 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.3-compact.zip
index 660b9ef38..61f904510 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.3-legacy.zip
index c571d524a..388b7b944 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.4-compact.zip
index 85de233b0..2328bec2a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.4-legacy.zip
index a1b3a0f58..ced71e98b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.5-compact.zip
index 637904c35..55cadd3b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.5-legacy.zip
index fe5737cc7..75c978810 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.6-compact.zip
index dbde7c43b..c87146bd2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.6-legacy.zip
index 332211d95..6dcdf832b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.7-compact.zip
index fa987d64d..0e8306b03 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.7-legacy.zip
index 9f2941b75..536dcddf8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.8-compact.zip
index dc9745804..acbf9df23 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.8-legacy.zip
index 75eb144f0..baac45118 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.9-compact.zip
index b1291fdea..a3f3bcabb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.9-legacy.zip
index 08d860b3c..69d15e167 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.7.0-compact.zip
index e4350cbe6..c3644c341 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.7.0-legacy.zip
index c932ad8d7..65d4f69e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.4.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.1-compact.zip
index d2c9f66ad..45829fd74 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.1-legacy.zip
index fa4050274..319f5c07d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.2-compact.zip
index 2bb535154..dc7154c9d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.2-legacy.zip
index 9b17f6c59..4dfec4465 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.3-compact.zip
index 5cd94cb96..74ff61fdd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.3-legacy.zip
index c47324b48..6211f3b5b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.4-compact.zip
index a71db3ce6..b8d33e97c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.4-legacy.zip
index 2dc427baa..72cac55fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.5-compact.zip
index eee4e6819..ae3504c9b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.5-legacy.zip
index 33f631263..83efea89e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.6-compact.zip
index 3f1ada6c0..fe19916b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.6-legacy.zip
index 8929b8001..7f4a68d4b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.0-compact.zip
index fbdc2001d..c0496d805 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.1-compact.zip
index b5298c8c7..c21757a53 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.10-compact.zip
index 2a63cdb0b..aead6ec86 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.11-compact.zip
index f5adbda67..895ee353c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.12-compact.zip
index ea1d06600..b9a774a22 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.13-compact.zip
index 0070f96c4..8b279a44d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.14-compact.zip
index a30137b08..ee7ac2802 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.15-compact.zip
index 26353193d..339e785c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.2-compact.zip
index d5fe6995c..22ddb76b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.3-compact.zip
index 933724c09..135bb38e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.4-compact.zip
index 28baa7eaf..a9f8d87cc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.5-compact.zip
index 978cff151..354d26a42 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.6-compact.zip
index 5e71f1a0d..52d9c16c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.7-compact.zip
index 364808bcb..0d6d34102 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.8-compact.zip
index 7adcceabd..f3a9376c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.9-compact.zip
index 94fac2cb5..c65548c2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-nested-import-0.7.1.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top-level-struct-0.8.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top-level-struct-0.8.0.sol-0.8.0-compact.zip
index 7cb2fb659..644f26759 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top-level-struct-0.8.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top-level-struct-0.8.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.0-legacy.zip
index 2b534e6bc..02d57de4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.1-legacy.zip
index d65eea6de..d165a86f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.10-legacy.zip
index 8601d4343..594e61587 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.11-legacy.zip
index 5466f7c4e..4d0088039 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.12-compact.zip
index 7aa97ee46..71aed0d3d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.12-legacy.zip
index fa901344c..0c1145576 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.13-compact.zip
index ed384081f..c7adce7dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.13-legacy.zip
index 1b73ba92f..7fd43738f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.14-compact.zip
index 21380cd4d..18c718c77 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.14-legacy.zip
index 0e938e148..824f077f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.15-compact.zip
index 482e64d16..5c4f6f3a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.15-legacy.zip
index 4065e8c0c..1b43dd524 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.16-compact.zip
index 75defa17a..44f154cad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.16-legacy.zip
index 8610eb29f..591a1fcac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.17-compact.zip
index f92ce1dfe..eabdcba98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.17-legacy.zip
index 4533b589f..30fb6f726 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.18-compact.zip
index 53ecd2b73..8da74a205 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.18-legacy.zip
index 0096ce439..7c023d850 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.19-compact.zip
index 6eb5a1320..f99127bb0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.19-legacy.zip
index cb2198ed0..04ba66ea2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.2-legacy.zip
index 8a76013d5..e4eb6f92f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.20-compact.zip
index d9eafcd73..7830d0352 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.20-legacy.zip
index 30456bcc2..926fead8a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.21-compact.zip
index a29df6ffd..8c66b0359 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.21-legacy.zip
index 1b65503e5..af5de6017 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.22-compact.zip
index e719172f9..95b407709 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.22-legacy.zip
index 57dbce997..83e90cd0b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.23-compact.zip
index 25f28f159..bf2769e07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.23-legacy.zip
index f741a4e5f..d70af4e13 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.24-compact.zip
index 874e8fd4f..06a09fd9f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.24-legacy.zip
index 7da6e9cd5..71f1ee3a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.25-compact.zip
index 93719f25c..7f766715e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.25-legacy.zip
index ad98d9c24..31de9459a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.26-compact.zip
index ffcb949f5..5c98ce925 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.26-legacy.zip
index c6fdcd422..514c6ecba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.3-legacy.zip
index 5b3ca0af6..fc475233a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.4-legacy.zip
index 8b272c196..4b99141cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.5-legacy.zip
index a844f267d..d1b194e81 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.6-legacy.zip
index e19776566..349ea09f2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.7-legacy.zip
index 0f7221d32..594485181 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.8-legacy.zip
index 2d57baa1c..8db71835b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.9-legacy.zip
index f525e5571..2e2d864dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.0-compact.zip
index 4dba8c40c..d13ac6818 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.0-legacy.zip
index c66189656..d0342a6d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.1-compact.zip
index 7978eee02..b3c1bb708 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.1-legacy.zip
index 3ac9961f5..eef616425 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.10-compact.zip
index bf326c669..a8d75d3b2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.10-legacy.zip
index bbdfa2dc2..25e273334 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.11-compact.zip
index 5a51c954b..abcd47070 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.11-legacy.zip
index 2940d7b78..45937bab8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.12-compact.zip
index d4cee2cd8..d96c2a524 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.12-legacy.zip
index 376451721..5cfcacfcb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.13-compact.zip
index 0a71e5adf..e3b8c59a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.13-legacy.zip
index 6abfb7207..fb698feb1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.14-compact.zip
index d6f78cb4a..747ec48a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.14-legacy.zip
index 2c7194152..1265fc959 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.15-compact.zip
index 7d9e06ae4..00b4f67cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.15-legacy.zip
index 4d9626be7..6d18a1877 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.16-compact.zip
index 434147142..dc1bbcae8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.16-legacy.zip
index bcbc75a13..1db103dac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.17-compact.zip
index e7534dcc5..4431ad050 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.17-legacy.zip
index f508524d4..1ecb703ea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.2-compact.zip
index 2644eb254..713789353 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.2-legacy.zip
index d20064dd6..1a39cc646 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.3-compact.zip
index 1094aa557..2f49ba2b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.3-legacy.zip
index 2f01cd515..fd919086e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.4-compact.zip
index 42525f4ec..0ddc8d4cd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.4-legacy.zip
index af1ced424..3b2743b80 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.5-compact.zip
index 1242e99b7..e010a4e05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.5-legacy.zip
index c66e258d4..3450a5e00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.6-compact.zip
index 2172a999c..3d60d9274 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.6-legacy.zip
index 307a912ab..0ee43bd47 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.7-compact.zip
index 0547222c2..b6dc7ab41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.7-legacy.zip
index b8acf8663..b97c6d1e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.8-compact.zip
index 78d74bfff..8a4c2c950 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.8-legacy.zip
index 1fbf76216..812083fa7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.9-compact.zip
index 567574403..497bc6a90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.9-legacy.zip
index 21fde5e6e..5e0f89db2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.0-compact.zip
index c9ecf2459..b9210a3ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.0-legacy.zip
index cabb6869a..f267cd353 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.1-compact.zip
index aa6bc1f9a..cd3180f1b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.1-legacy.zip
index dd6007206..bec11638f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.10-compact.zip
index 5f0aa0886..03d2ec9ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.10-legacy.zip
index a724198f7..9dfa2885d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.11-compact.zip
index d5a762e7c..15353ec1b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.11-legacy.zip
index dcbe5d2d7..50438d57f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.12-compact.zip
index 06372fe57..d48282b38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.12-legacy.zip
index 76fd8e5e9..e722d9615 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.2-compact.zip
index 31fa80687..c8590f81a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.2-legacy.zip
index c86c6ac50..66c3e170c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.3-compact.zip
index ec7c6f68c..e2f78d056 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.3-legacy.zip
index fa214eddd..b85df65b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.4-compact.zip
index f25a06b15..93ef6c886 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.4-legacy.zip
index 3f656f9a8..3d8dab84b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.5-compact.zip
index c61bb1ea7..ed3081528 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.5-legacy.zip
index 37709764d..8673bb474 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.6-compact.zip
index 951df8ea1..b844b4bd8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.6-legacy.zip
index 58a5742a8..1e87243a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.7-compact.zip
index dd14e48ce..0804fd429 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.7-legacy.zip
index 85014625d..f4313946d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.8-compact.zip
index 704e8d078..e766b49a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.8-legacy.zip
index ae0324431..235ea2674 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.9-compact.zip
index ae22f0e97..b7af523b7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.9-legacy.zip
index 6d2fba8c4..facdebacc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.0-compact.zip
index 7f3f43761..41de8061a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.0-legacy.zip
index fbb26969c..0a39f1fdc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.1-compact.zip
index dad80fde7..b66bda691 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.1-legacy.zip
index 353e57642..c11dba131 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.2-compact.zip
index 1ddcbc1c1..d6338d2ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.2-legacy.zip
index ea3445200..ea0686742 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.3-compact.zip
index 72f78edee..258b51aa9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.3-legacy.zip
index 98dc6e2d9..2bf8a0d06 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.4-compact.zip
index 2d02b0cf2..4afdb3d0c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.4-legacy.zip
index 90de1cae8..1afcbfa89 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.5-compact.zip
index 12fb1c386..9c716f811 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.5-legacy.zip
index 99b683d54..8577cd983 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.6-compact.zip
index 7a47e9a30..308d57381 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.6-legacy.zip
index d743368bf..ad7fddf3a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.4.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.0-compact.zip
index 2b43773b2..852b32c2c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.1-compact.zip
index d38e2cf93..2b811ed6e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.10-compact.zip
index b15009d7c..5ef2d252e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.11-compact.zip
index 5c2d6e74b..c1892c74c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.12-compact.zip
index 0524155fe..0dace9229 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.13-compact.zip
index 8a141b5fd..647204403 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.14-compact.zip
index 7048a6264..cd83ae4d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.15-compact.zip
index 81f8f6716..0e9911135 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.2-compact.zip
index f7cd75ef0..c2ebd2d4e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.3-compact.zip
index 29a6c6535..0f5e4ea5c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.4-compact.zip
index 19c6452cc..17addf4e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.5-compact.zip
index eb1951eb8..11564897c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.6-compact.zip
index 6d8e1b20a..efb0aceab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.7-compact.zip
index a08c06719..c8835d3c3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.8-compact.zip
index 52e1d8b65..78e0fc128 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.9-compact.zip
index 9aef97402..5be6ef33c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable-0.8.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.0-legacy.zip
index 824d899d6..460118e93 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.1-legacy.zip
index a76dc6d3b..cdc0f8250 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.10-legacy.zip
index d99045d83..2cf248b6a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.11-legacy.zip
index ad3f06d9e..48107ce1b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.12-compact.zip
index 22cc7d3f4..7eb87fbe6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.12-legacy.zip
index d620db472..6d723810f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.13-compact.zip
index 81a1047cc..8c622a633 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.13-legacy.zip
index 4a2cbd839..d91938f88 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.14-compact.zip
index 774d177ab..066a1069e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.14-legacy.zip
index b6d1feca9..69c87253d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.15-compact.zip
index e904ea65e..8f9035a91 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.15-legacy.zip
index 1fa83f1c2..f1c4b1f19 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.16-compact.zip
index dd85fcd3b..6a8ea2b03 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.16-legacy.zip
index 79c9ea363..6a7340280 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.17-compact.zip
index 019d1621f..e6798d75f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.17-legacy.zip
index d575d083e..6ff379e09 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.18-compact.zip
index 030fa2948..0e506ca7f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.18-legacy.zip
index c8cbd1218..0740acaa3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.19-compact.zip
index b02e6f254..36b4a7efe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.19-legacy.zip
index f108dfe39..42e84eef2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.2-legacy.zip
index d39a2b037..d906598b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.20-compact.zip
index 1bf2c2af8..7b05187a3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.20-legacy.zip
index 6a355110f..94e455c56 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.21-compact.zip
index b8495ee5f..e7e7f7df9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.21-legacy.zip
index 573af36ab..1758e8557 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.22-compact.zip
index d092208e9..aab730a3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.22-legacy.zip
index e7120ddfe..652c8eb8c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.23-compact.zip
index 14f8918dc..683505c3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.23-legacy.zip
index db65e2be3..43034708a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.24-compact.zip
index 88225811e..15b267364 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.24-legacy.zip
index 351ad8cb0..f5ce3449a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.25-compact.zip
index bae02b2ed..43fb5664f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.25-legacy.zip
index c415768d4..5051f05a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.26-compact.zip
index be68bc338..c0f54de32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.26-legacy.zip
index 225d0f979..756f7d49f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.3-legacy.zip
index 12087dc0e..03b0c86ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.4-legacy.zip
index 3631e8487..0a92d4274 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.5-legacy.zip
index 649651c74..af154d366 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.6-legacy.zip
index b6e82c32d..9356802fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.7-legacy.zip
index 80fb3ed3f..f897bf1bd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.8-legacy.zip
index 1642f1245..9d2d2828a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.9-legacy.zip
index 1a9e076d1..702faa25d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.0-compact.zip
index ba1ca3aca..de51c8b97 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.0-legacy.zip
index 23b183d9e..2306b7d27 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.1-compact.zip
index 76ce27d12..f117b2017 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.1-legacy.zip
index dc5ed4a4a..0ebdc7942 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.10-compact.zip
index fc5973593..59588a118 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.10-legacy.zip
index 6f79c1eb6..c83e25861 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.11-compact.zip
index 450518a7e..06e1ece3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.11-legacy.zip
index 52affc0b2..23b69e319 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.12-compact.zip
index c47e8007c..c7cbc2954 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.12-legacy.zip
index b31487cdc..cc4e5ac4c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.13-compact.zip
index c0311c4f9..d4bba51c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.13-legacy.zip
index 629bb1815..7ee3a5f88 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.14-compact.zip
index ea67a9110..077ea9c2d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.14-legacy.zip
index b6c92bc40..b9d2ca823 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.15-compact.zip
index 0490866fc..c47aaedb2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.15-legacy.zip
index 968d4b616..dbaa5df7f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.16-compact.zip
index 2db99731d..78b0a53b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.16-legacy.zip
index e454e8996..a9fbbeb9c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.17-compact.zip
index eb5f74c6b..3c01ef547 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.17-legacy.zip
index 35343290e..ebcdb5f19 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.2-compact.zip
index dc73fdb47..9a2e20187 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.2-legacy.zip
index b9ebda62c..9f45059f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.3-compact.zip
index 52de82934..bea0df94d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.3-legacy.zip
index 2ab8d67bc..22b516eec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.4-compact.zip
index 032600c79..20e70c942 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.4-legacy.zip
index 63bad5308..17c6243d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.5-compact.zip
index 6fb5f7b5b..34f04fb07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.5-legacy.zip
index 7130f4560..c8d2ad312 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.6-compact.zip
index 888bdffe1..e048be870 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.6-legacy.zip
index fce019f24..c9c277377 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.7-compact.zip
index 9c755191c..e23300540 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.7-legacy.zip
index 593fcaf35..33cde834d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.8-compact.zip
index 0183c8861..dba877881 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.8-legacy.zip
index 649a797df..c18e9b744 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.9-compact.zip
index 16ca126aa..e0d85571b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.9-legacy.zip
index eda841e5c..1ce63d5d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.0-compact.zip
index 331599008..e15a0b002 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.0-legacy.zip
index 52c2982e3..deace2802 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.1-compact.zip
index 600d6c8ae..bb4f13292 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.1-legacy.zip
index 7915310f2..1f6833516 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.10-compact.zip
index bdafb4c11..c486b3982 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.10-legacy.zip
index dddfa1476..883e9031d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.11-compact.zip
index 56dd033f3..16c31bfc0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.11-legacy.zip
index 73b175bb4..372dfd8b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.12-compact.zip
index e92f5e1b8..83447baab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.12-legacy.zip
index d9ac1632c..38dd33490 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.2-compact.zip
index 173f6db7b..6b6810be9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.2-legacy.zip
index e2a70fc65..7ec5ef654 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.3-compact.zip
index c9e6b3803..dc3995f9b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.3-legacy.zip
index 719cb15f4..eb5bda721 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.4-compact.zip
index 636057423..baa7ed84a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.4-legacy.zip
index d91d5b505..2427e368c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.5-compact.zip
index 9ecbd11e7..15bf2ba24 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.5-legacy.zip
index d378c4c5e..01a6b8057 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.6-compact.zip
index 4945ba936..219e6de78 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.6-legacy.zip
index 8aeaa2cee..20d4daa4a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.7-compact.zip
index 1cacfaadb..6f30dfe55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.7-legacy.zip
index 878dc2677..042826239 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.8-compact.zip
index 02b4e33ad..752d85829 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.8-legacy.zip
index 0c48ec08e..ba10507f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.9-compact.zip
index 2a6e8864f..c0b6994fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.9-legacy.zip
index ab878eead..c338b679e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.0-compact.zip
index 4dcca1095..e3f02aee7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.0-legacy.zip
index 73570e528..e733ca5af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.1-compact.zip
index 538549e75..fea7bd11d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.1-legacy.zip
index 287627c1b..4ba2d8555 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.2-compact.zip
index 1248921f1..fb14e334b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.2-legacy.zip
index f19be8e33..ed17fee69 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.3-compact.zip
index fc0ff8dd4..57564fe95 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.3-legacy.zip
index 75e1fd5ee..299ed15b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.4-compact.zip
index 424d3a0c6..e9e7ed9c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.4-legacy.zip
index 49503ce6a..161365823 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.5-compact.zip
index cc518f74d..844a3bd41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.5-legacy.zip
index ee2460345..eccf10640 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.6-compact.zip
index e816631e7..1dae93039 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.6-legacy.zip
index 5e13eae82..895d985fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.4.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.0-compact.zip
index 43f4159f3..efd6a720d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.1-compact.zip
index b3fd9a206..d2b074648 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.10-compact.zip
index 7a723c715..0cf49b51d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.11-compact.zip
index 2594d6271..6c6418b10 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.12-compact.zip
index c331b77f9..08e3d74f2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.13-compact.zip
index 12d6382aa..066caaa59 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.14-compact.zip
index 40233c756..2cd2de193 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.15-compact.zip
index 586bd97a8..b308dcc83 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.2-compact.zip
index ce2153ee8..86c9eec90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.3-compact.zip
index 0103eb019..d67662beb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.4-compact.zip
index 692ae4f6d..226688adf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.5-compact.zip
index 6c882fee3..dff1d4284 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.6-compact.zip
index 028290900..591dcff67 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.7-compact.zip
index 973e50dff..016d9dd23 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.8-compact.zip
index 7b3e019a2..3c42a5588 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.9-compact.zip
index 5fedfac40..5f2c6644d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/top_level_variable2-0.8.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.0-legacy.zip
index 04dc217a8..64e642d40 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.1-legacy.zip
index 98b9166f8..f5d6ea931 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.10-legacy.zip
index 1d1c0d005..959b62d81 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.11-legacy.zip
index bf56ab75e..572f8f074 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.12-compact.zip
index 9fb83735c..16b4195ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.12-legacy.zip
index 31185f085..9bb897f4e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.13-compact.zip
index fefebf953..c0e8e46ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.13-legacy.zip
index 7e933f54a..03208cd48 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.14-compact.zip
index bdc77a054..3e44a2ca2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.14-legacy.zip
index 535eee60f..b33a9ccb2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.15-compact.zip
index 0aaf77901..1aea510b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.15-legacy.zip
index a2e2a572f..4d843a69f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.16-compact.zip
index c4e5af90a..6ab9db8a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.16-legacy.zip
index 7714ee0b7..34ef6cbea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.17-compact.zip
index 4ef7c1223..e5ace6e90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.17-legacy.zip
index cba9d9bfc..a4e2960b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.18-compact.zip
index 280ea0cb7..e44540214 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.18-legacy.zip
index c0cc8e78b..d4f154ca8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.19-compact.zip
index 673abac92..c291aac04 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.19-legacy.zip
index 771129e32..d2f8c48d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.2-legacy.zip
index 51c0f9681..1106df1ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.20-compact.zip
index f5b5c42df..d8160f0fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.20-legacy.zip
index 88aff80a4..ed3f91f41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.21-compact.zip
index cb924170d..45aeda1dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.21-legacy.zip
index 9d14d911d..c314d4c5e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.22-compact.zip
index ccc279cd0..58a5b1ad3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.22-legacy.zip
index 6b17dc536..5f372764c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.23-compact.zip
index b3f89b2ae..6e40b403e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.23-legacy.zip
index cba7da5d9..739453c59 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.24-compact.zip
index e4ac8a19d..235c51b90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.24-legacy.zip
index 891d5f913..ebd91b28c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.25-compact.zip
index 7149679b2..48892fc59 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.25-legacy.zip
index 206861787..2737b2f23 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.26-compact.zip
index 4ef93bb23..a2e77bdb7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.26-legacy.zip
index 27260a030..c59b81856 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.3-legacy.zip
index c498a8bdb..2fd179dc2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.4-legacy.zip
index d65e210f9..7eabeb6a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.5-legacy.zip
index b26c03eb9..640b59e98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.6-legacy.zip
index c5a704fb6..a3f24ec4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.7-legacy.zip
index 49077e685..c23e93c24 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.8-legacy.zip
index 3ff71cdcd..12b0058fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.9-legacy.zip
index 5e776960b..9e6b3f643 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.0-compact.zip
index c1b397d44..14ec80734 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.0-legacy.zip
index d5492e8fa..6db7f24e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.1-compact.zip
index a87fa765d..c17f8342b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.1-legacy.zip
index 1e8fb2322..912989a94 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.10-compact.zip
index d08d17ad9..30bcc2e20 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.10-legacy.zip
index c2523d0ef..7d14e1343 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.11-compact.zip
index f200540cc..5b7aeef58 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.11-legacy.zip
index a8b4fa3d4..5f7d0f8b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.12-compact.zip
index 0362ca98e..ed84ab581 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.12-legacy.zip
index b545e28dc..3e36f703d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.13-compact.zip
index 5c3c4efcc..097ea40ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.13-legacy.zip
index 2ec0625dc..a69a1b5c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.14-compact.zip
index ab25dea09..2281245c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.14-legacy.zip
index 2fa359b8f..b6a563893 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.15-compact.zip
index 541aff8ff..357458206 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.15-legacy.zip
index c4a3d1605..d41911abf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.16-compact.zip
index 7c528e303..7f7e01486 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.16-legacy.zip
index f444facfe..301d768e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.17-compact.zip
index 9bcf0792d..3b622a49e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.17-legacy.zip
index 61f612c0f..9b85965cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.2-compact.zip
index 38c2151f6..a9d9fcd36 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.2-legacy.zip
index e6128824a..7726a1040 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.3-compact.zip
index 9970a0c0c..e47c73579 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.3-legacy.zip
index 830603444..629368546 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.4-compact.zip
index 5837dbfa0..756f72f54 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.4-legacy.zip
index 95af39dc5..44020c395 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.5-compact.zip
index 79bded00a..51b59c698 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.5-legacy.zip
index dc6252445..2d96c0304 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.6-compact.zip
index 435879d6f..3ba4da947 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.6-legacy.zip
index a18bf4806..0ca1bd4c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.7-compact.zip
index 9e1426299..d2d44dbf5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.7-legacy.zip
index 313f42d9b..1707734b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.8-compact.zip
index 23f1086a7..6cf6b3911 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.8-legacy.zip
index 11cce6bee..b6eaae930 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.9-compact.zip
index d4914cd63..cd76593b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.9-legacy.zip
index 4a326ed3e..5ce79e620 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.0-compact.zip
index d5ebfb65c..36c84a547 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.1-compact.zip
index 0d43274b5..ecf448aa3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.10-compact.zip
index 13f084017..877b5918a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.11-compact.zip
index 75b36614e..8d78f4aef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.12-compact.zip
index 594e9e9c7..aa08c7fbc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.2-compact.zip
index 98f9966c4..4cbdbb99d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.3-compact.zip
index 9d8cccf4e..db922d030 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.4-compact.zip
index 31552b7ba..f701f5493 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.5-compact.zip
index bb7f19c09..ffea5d05b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.6-compact.zip
index 63f5fe216..0386b9001 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.7-compact.zip
index 4aadf9c7a..aa2225c1f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.8-compact.zip
index ae0e01054..f23426adc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.9-compact.zip
index b3a3e5f5b..6a83e9190 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.0-compact.zip
index 4d9826cd3..a3eec7649 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.1-compact.zip
index ef7f69d5f..abf211c5b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.2-compact.zip
index 33f6407ee..8c263e08f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.3-compact.zip
index 4c4f23bce..dded2c81e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.4-compact.zip
index d2f2f503c..90691f65d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.5-compact.zip
index a3df5f240..c2ef60f65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.6-compact.zip
index 8de85d76d..77c14b185 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.0-compact.zip
index ebbfcacbf..65921bfa3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.1-compact.zip
index b23d71134..06cc3a444 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.10-compact.zip
index e21a9e5c0..bd9d7ca0f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.11-compact.zip
index 61d5760ce..0201b9d86 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.12-compact.zip
index ad4b32aa4..28bfd6ca5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.13-compact.zip
index 015644b04..941eeb376 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.14-compact.zip
index 2972f676a..b44cb84e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.15-compact.zip
index 680461aed..147feea31 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.2-compact.zip
index c6ebabb42..96049ea07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.3-compact.zip
index 877ab7c58..cfa52e829 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.4-compact.zip
index fbee23563..6465a9341 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.5-compact.zip
index 01a12fb78..f9f8e5d90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.6-compact.zip
index 82b60acff..fe07dd986 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.7-compact.zip
index b9398a8fb..0ceae38fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.8-compact.zip
index 7b68beab6..0323556c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.9-compact.zip
index 3b0355258..b690efda1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/trycatch-0.6.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.0-legacy.zip
index 5e505b583..5537de05d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.1-legacy.zip
index 04de7cb1b..f8cd5d001 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.10-legacy.zip
index 83d5157ef..8a2fb874d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.11-legacy.zip
index cbe3a4ce9..9885efe7c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.12-compact.zip
index 9e6f24ec3..b391b5126 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.12-legacy.zip
index 6c47ce2d3..27f8b1565 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.13-compact.zip
index 31a612263..710270122 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.13-legacy.zip
index c02232a1a..f9ef66c5c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.14-compact.zip
index e84540ae3..c54062982 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.14-legacy.zip
index 7bbe8e500..e34f335c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.15-compact.zip
index 779059e45..3b12fcf85 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.15-legacy.zip
index 1d7e67769..50e402e16 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.16-compact.zip
index be7063271..a3a62da5a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.16-legacy.zip
index 177452745..b6d6017d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.17-compact.zip
index f86f7ca42..584c3da38 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.17-legacy.zip
index 4447c89ff..1f6b95864 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.18-compact.zip
index c5163e52f..e883f5cee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.18-legacy.zip
index 5663804a1..b10481c85 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.19-compact.zip
index 72cfbd293..f426587d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.19-legacy.zip
index f85bb06e3..991b16ae1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.2-legacy.zip
index 7fcf67e19..dad0afd1b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.20-compact.zip
index f3b0f606e..f40624398 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.20-legacy.zip
index 9a2430405..6bc0bb8b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.21-compact.zip
index 34a75ab74..013a4a25f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.21-legacy.zip
index e2f2ebf74..1f2ae7877 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.22-compact.zip
index 9ea94a228..64f0f7ef4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.22-legacy.zip
index 4a78b94ca..3de8f4952 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.23-compact.zip
index c02458f72..0e1a43294 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.23-legacy.zip
index 56588c21d..54896786e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.3-legacy.zip
index db4602660..f361ad10b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.4-legacy.zip
index b2473aea3..8a784fee6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.5-legacy.zip
index 70981ba68..39d2757ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.6-legacy.zip
index 649f80345..c0c9f7542 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.7-legacy.zip
index 889d2523f..9b5a4e98e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.8-legacy.zip
index 7506a4163..67dfcec63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.9-legacy.zip
index 1e839e566..02e83343e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.24-compact.zip
index a13610221..1cbf979a0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.24-legacy.zip
index af0d4e8ad..272f9f222 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.25-compact.zip
index 47c5b7381..8d053bc6b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.25-legacy.zip
index 6ded7a872..93968cff0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.26-compact.zip
index 7fd26a680..e84be0733 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.26-legacy.zip
index 1615eb596..10d440a28 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.0-compact.zip
index 9dbf43105..43517c164 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.0-legacy.zip
index 2f36f33e2..7c452538e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.1-compact.zip
index 8ae72d364..ce1c3676b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.1-legacy.zip
index e1cfc71d7..2a8a89fc7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.10-compact.zip
index e7d6ce8a6..9883378e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.10-legacy.zip
index e816cc726..fac24a964 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.11-compact.zip
index 5ef48f388..12103e5c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.11-legacy.zip
index b54072f2e..9003b90ea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.12-compact.zip
index e8058a3f9..742b16cf9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.12-legacy.zip
index fa0988a0d..3352c6f5b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.13-compact.zip
index aef31d91d..97f83694a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.13-legacy.zip
index dafaa9f32..127ea7b41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.14-compact.zip
index fdbaa1f98..d7d48ec19 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.14-legacy.zip
index 6dcd3d061..3dab3d770 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.15-compact.zip
index 37f68456d..a178bd366 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.15-legacy.zip
index 5da75933c..74cb8d9b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.16-compact.zip
index b98778e9f..fa4646e10 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.16-legacy.zip
index 59026baec..b55f22fcf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.17-compact.zip
index 4648160e1..091c943ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.17-legacy.zip
index f949a5b2a..e414b0ed6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.2-compact.zip
index 013dd7170..2533a90f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.2-legacy.zip
index 709026d85..8c91d80e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.3-compact.zip
index 7768ffe81..29375c1c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.3-legacy.zip
index 5f7878093..fe4c13357 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.4-compact.zip
index 90089dfc4..0fcfa9b17 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.4-legacy.zip
index 125a9efd2..c9fdad964 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.5-compact.zip
index e6e5847db..e587e7523 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.5-legacy.zip
index 1b6cd3d07..0615cbd0a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.6-compact.zip
index 501f368ce..3aaa5eaca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.6-legacy.zip
index 92193fc89..13257cd5d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.7-compact.zip
index 8edb6381a..ba0b68a3a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.7-legacy.zip
index 4580fe7e2..e36965edc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.8-compact.zip
index 5b0d902d1..3be24b4b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.8-legacy.zip
index c43ccd227..bec81325e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.9-compact.zip
index 8b102c9ee..3ee594f08 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.9-legacy.zip
index ed3ac88e6..daf38da3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.4.24.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.3-compact.zip
index 1157936ee..7833ccd52 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.3-legacy.zip
index 4ccec5bb1..c345134f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.4-compact.zip
index 3a4c0a3af..8145853d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.4-legacy.zip
index 2aa7c6c82..b48960bdf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.5-compact.zip
index 181bc7e1e..ceaf1f089 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.5-legacy.zip
index ff17e300e..510e07315 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.6-compact.zip
index 963bb5db4..e5fdb3a8d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.6-legacy.zip
index d2a6ea503..0e76cb09e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.7-compact.zip
index 483a46c03..248792d64 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.7-legacy.zip
index 2d87529c6..c1b8272ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.8-compact.zip
index e8311da48..c4e50f582 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.8-legacy.zip
index aea11cc17..4a63c4377 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.9-compact.zip
index e158af014..ddbfd87af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.9-legacy.zip
index 456334b7f..fceb1579d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.0-compact.zip
index fed8ba1dc..4d84a49c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.0-legacy.zip
index e302c884d..200cbd8e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.1-compact.zip
index 667d9dae1..f6b0fd3ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.1-legacy.zip
index 204899825..b4a74bf2d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.10-compact.zip
index 1ec6110aa..53e88d68a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.10-legacy.zip
index f58b820aa..138025a39 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.11-compact.zip
index 9ef4fb966..68445aa80 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.11-legacy.zip
index 3944a9223..9c3a58ff3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.12-compact.zip
index 6812df801..5765f2a41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.12-legacy.zip
index ad0eb6203..34d85e705 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.2-compact.zip
index 8736b193b..dfe858fca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.2-legacy.zip
index 60e274d52..980208560 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.3-compact.zip
index 9a53f0daa..1c71b3db8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.3-legacy.zip
index 4910ce211..a94d3e71b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.4-compact.zip
index 689150b43..23cf8baf6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.4-legacy.zip
index 0d12d992a..a48cdf77e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.5-compact.zip
index 3ca40807b..4b7c316e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.5-legacy.zip
index 78ac83c00..cbb35a967 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.6-compact.zip
index f249178a3..a7011818a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.6-legacy.zip
index ebfdd8f24..81fa9bcfa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.7-compact.zip
index c07feb44d..a94b7bda7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.7-legacy.zip
index 8f59cd490..18821cc7f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.8-compact.zip
index b3a5bef7f..6e50a9a26 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.8-legacy.zip
index d8fae7ab9..8e6d64cc6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.9-compact.zip
index b2ba06a1f..040a85410 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.9-legacy.zip
index 07c042fea..1de01187d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.0-compact.zip
index 3806a2c1a..c97f4fc47 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.0-legacy.zip
index c9d56fce9..869c07220 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.1-compact.zip
index 1f4777a6f..934b14249 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.1-legacy.zip
index bbff85e79..2a46e17d8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.2-compact.zip
index 6a39eeae1..59f6758eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.2-legacy.zip
index d1130a883..dbd52ce44 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.3-compact.zip
index aaae90b67..f07c2393e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.3-legacy.zip
index 15e36fb23..fc96653ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.4-compact.zip
index bd95b476b..512c48d37 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.4-legacy.zip
index 54f3ed2c2..1da71a1aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.5-compact.zip
index acd6d7ac7..b6758b89f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.5-legacy.zip
index 71151f473..dc7ee1da7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.6-compact.zip
index 25acdf89e..b45f2081d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.6-legacy.zip
index f963efc8a..8714b00c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.0-compact.zip
index c6df50ed6..b3d105cc7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.1-compact.zip
index c72a088a3..726dd21c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.10-compact.zip
index 3903bd489..41429f995 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.11-compact.zip
index 4f5af9897..460e62123 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.12-compact.zip
index 73b0e04d3..c4a95723f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.13-compact.zip
index 0b2a0f6ec..dcd6db0f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.14-compact.zip
index 3de857506..5171c2e4c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.15-compact.zip
index fb4545107..186ea447a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.2-compact.zip
index 0a5132e0f..bf67e1336 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.3-compact.zip
index 7acd7aa43..86e1f9a1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.4-compact.zip
index d35d59b14..1c5db8e49 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.5-compact.zip
index 8d8bf6b29..50b7f77f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.6-compact.zip
index 4f29246bc..5868e468b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.7-compact.zip
index 72d0c1a39..fdb0aff09 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.8-compact.zip
index f7e469208..b6d544401 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.9-compact.zip
index 1801c8aa0..3ab8424bc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/tupleexpression-0.5.3.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.0-legacy.zip
index 177ecd643..006c7b739 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.1-legacy.zip
index cccb59cd7..02110d9b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.10-legacy.zip
index b82c5ca67..1736932da 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.11-legacy.zip
index 34a12a2c6..4d987cfb3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.12-compact.zip
index 749f0f8c8..df07ed813 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.12-legacy.zip
index 7f8a326f8..f5d5200f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.13-compact.zip
index 2d49d68fb..13fb010bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.13-legacy.zip
index 51346f9e2..071b3f0c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.14-compact.zip
index 662d49768..53f289b65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.14-legacy.zip
index e160dea15..1b092e250 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.15-compact.zip
index 54aa4a627..f12c55738 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.15-legacy.zip
index 0b6e2fe5b..80fbcfda1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.16-compact.zip
index a0416660a..e837dd908 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.16-legacy.zip
index fa56d9ca1..ec9f73791 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.17-compact.zip
index f0fec7832..32ba0f120 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.17-legacy.zip
index f21c4bc8f..af8ae78e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.18-compact.zip
index faf2ee5fb..8262a7f1a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.18-legacy.zip
index c7b29839c..42ec02d79 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.19-compact.zip
index 825da0626..808a8e657 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.19-legacy.zip
index fb07e5ce4..958237aad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.2-legacy.zip
index 6906e860e..d4cc74f33 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.20-compact.zip
index f0816919f..965632039 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.20-legacy.zip
index c35ce47aa..d2e5a9633 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.21-compact.zip
index d6318f90b..682616a28 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.21-legacy.zip
index 6b56698d2..a38652b86 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.22-compact.zip
index 0ef08050e..cf3f0370b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.22-legacy.zip
index 173b0c84d..fc0ac1482 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.23-compact.zip
index f1ff08dc0..03fa455da 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.23-legacy.zip
index cb46df36e..69aafe626 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.24-compact.zip
index 30fa375aa..41859c06e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.24-legacy.zip
index 1d5d45e98..b7526c74d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.25-compact.zip
index ca5f4b3cd..edb39bdc9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.25-legacy.zip
index 709148eba..6bedc7f56 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.26-compact.zip
index 1d70885ad..53067c592 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.26-legacy.zip
index f69131ef8..4627a2726 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.3-legacy.zip
index e5e44e208..8c92a8fd0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.4-legacy.zip
index f9e8dcb5e..130256162 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.5-legacy.zip
index 5120a6609..275a2b97a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.6-legacy.zip
index 747338aa7..574a8aa92 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.7-legacy.zip
index dfe634412..e4fe446d9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.8-legacy.zip
index 3f703323f..5b5b1b1fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.9-legacy.zip
index b9b7f02c6..6c1b77789 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.0-compact.zip
index af0ab1998..53a106865 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.0-legacy.zip
index d35c397aa..2e80b5e82 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.1-compact.zip
index 699c45ee8..13df45913 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.1-legacy.zip
index 59a559131..3cf694b70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.10-compact.zip
index 868724b42..c5d69b311 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.10-legacy.zip
index da0376f45..e3a69005d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.11-compact.zip
index 6f8f169cc..7086adcb5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.11-legacy.zip
index 4a3b866be..913c2c22f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.12-compact.zip
index ff156d306..e345f42e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.12-legacy.zip
index cf843225c..1a34611c8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.13-compact.zip
index ffba26af4..867c22114 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.13-legacy.zip
index e2efcb280..9d6980389 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.14-compact.zip
index 7fcbceb1d..412be1c2a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.14-legacy.zip
index 5661c734a..12768ecbf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.15-compact.zip
index c7a6f2998..6e2ca498b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.15-legacy.zip
index 3406fa091..64f1dbae8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.16-compact.zip
index a03d212fd..437861495 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.16-legacy.zip
index 7cb7c56e5..4e90895d9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.17-compact.zip
index 2501662db..f57455876 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.17-legacy.zip
index 4224de943..992d17396 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.2-compact.zip
index 1c79f7e5a..90c09a039 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.2-legacy.zip
index bef7f4045..1bec5634a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.3-compact.zip
index bd82a18d3..b77b1b10b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.3-legacy.zip
index dc32451a8..4afedd7db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.4-compact.zip
index 2a94ff8af..9353003ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.4-legacy.zip
index 744eb4a13..f19814b41 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.5-compact.zip
index 276f2a261..dc10cf6e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.5-legacy.zip
index 529961298..a22ba3d99 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.6-compact.zip
index 09b5b5d1b..5f09fc88e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.6-legacy.zip
index a41ad868f..538a2e45b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.7-compact.zip
index 694ef98ab..0fc09d188 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.7-legacy.zip
index 4299fd216..4242934ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.8-compact.zip
index 3dd24a644..a2bba079f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.8-legacy.zip
index cd5a4c487..b6fa1d7ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.9-compact.zip
index c43c8357d..cb21e1be8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.9-legacy.zip
index b0c6bf2f5..3cb30054e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.0-compact.zip
index f1f8dc96d..72a6ec1e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.0-legacy.zip
index 9a59e7fbb..dcec34b1d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.1-compact.zip
index ccd27fba6..b7fcff0e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.1-legacy.zip
index 26e16f70a..563aee5db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.10-compact.zip
index 5eaafe842..630469f2d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.10-legacy.zip
index 97f16f906..ef90627d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.11-compact.zip
index d586d7c9d..6e3ba28b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.11-legacy.zip
index 485cc08e8..d2dee37bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.12-compact.zip
index 932aaa48b..28b2276b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.12-legacy.zip
index bbdf78e8b..65076c74a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.2-compact.zip
index b483bb370..4c63c029b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.2-legacy.zip
index 3972e5e6a..8bc87784d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.3-compact.zip
index 403fb01af..96979452e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.3-legacy.zip
index 0516f5a57..ee5c3eb98 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.4-compact.zip
index af541e9e1..40d6590eb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.4-legacy.zip
index 97c40da20..57133f35f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.5-compact.zip
index c9df91321..303d58680 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.5-legacy.zip
index 25cc0b949..793cddd00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.6-compact.zip
index a4e915976..1cdf6a00f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.6-legacy.zip
index 5bdfad131..e72a5a3fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.7-compact.zip
index 7501261ed..9eb85d6ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.7-legacy.zip
index 21cea76be..2b349436f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.8-compact.zip
index 5ac29bc68..cf4ef522d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.8-legacy.zip
index 2a0bca3f0..26459da00 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.9-compact.zip
index a15093901..c2e7ef3b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.9-legacy.zip
index 7ef087fab..c2088c3fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.0-compact.zip
index 3c0eb37db..b299e1daf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.0-legacy.zip
index b4abbf813..025abc008 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.1-compact.zip
index 28bdaa3e4..831ceb26d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.1-legacy.zip
index 093e73861..a2058c9f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.2-compact.zip
index 9f1ad03ae..5cb6280e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.2-legacy.zip
index 52a39c664..797f167c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.3-compact.zip
index 122d92558..6f0fe775f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.3-legacy.zip
index d48ba6149..d29db6bf8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.4-compact.zip
index 56cbef676..333a612fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.4-legacy.zip
index a0ebafdee..4b53f378f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.5-compact.zip
index 741ae54db..60badbb85 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.5-legacy.zip
index 9c25e9172..574eadddf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.6-compact.zip
index 3461fb532..c6314e02f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.6-legacy.zip
index 2f6378639..131ea0ddb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.0-compact.zip
index 3f6a73a4d..edb527345 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.1-compact.zip
index 79e5e3988..b4a3fe07c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.10-compact.zip
index d029fd68b..e8eb831ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.11-compact.zip
index 5cc7d5504..08ed81d9b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.12-compact.zip
index 5fc36a71d..6b193aafd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.13-compact.zip
index 08f57c70f..85381d4ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.14-compact.zip
index e9876b839..c5a30f660 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.15-compact.zip
index 2dafaf643..98f0323b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.2-compact.zip
index f8cad6ea9..24e3bdd5c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.3-compact.zip
index e5c3965c4..2d94e72e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.4-compact.zip
index bbbf7ef82..0134436c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.5-compact.zip
index 27e858642..95e2a82b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.6-compact.zip
index d418a24d4..e4cb509f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.7-compact.zip
index c13771eb8..3c7decec3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.8-compact.zip
index 683c94b2b..4f184e974 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.9-compact.zip
index 2eda76c18..ed205446f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unaryexpression-0.5.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.0-legacy.zip
index e2005883e..e4686ce02 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.1-legacy.zip
index 14fe51770..4953c431d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.10-legacy.zip
index 2fed8bfcd..1921ab40d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.11-legacy.zip
index 33840f2bb..bf90471e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.12-compact.zip
index e44cab126..ec1e4017d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.12-legacy.zip
index ddebde55f..8c5bb75cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.13-compact.zip
index fd3e9d1af..efd3e466e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.13-legacy.zip
index 50b1458c9..f62c9a221 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.14-compact.zip
index 2c7228543..506eba5e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.14-legacy.zip
index a1a7ca409..b0f1acdd4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.15-compact.zip
index a92467989..202b2dea8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.15-legacy.zip
index 3c134eeb4..61b8fd6f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.16-compact.zip
index e02550c12..1165a5677 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.16-legacy.zip
index 6026abcd0..4677ed4f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.17-compact.zip
index 07065788f..cfb062ae1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.17-legacy.zip
index 965710f98..54d5ff6f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.18-compact.zip
index 5f56f91b4..50a040b3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.18-legacy.zip
index 6f690d06b..441b84366 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.19-compact.zip
index 77f93b91e..5420a46d8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.19-legacy.zip
index efb2ab893..43284533d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.2-legacy.zip
index e695d1b61..ad6d7edf5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.20-compact.zip
index b6d3bf908..b567e1507 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.20-legacy.zip
index 9bc824ff2..68d58a51e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.21-compact.zip
index 3658c57b9..dafaf874d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.21-legacy.zip
index e93cb0247..4a326190a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.22-compact.zip
index 27bdffdc0..a4df65a25 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.22-legacy.zip
index f530450ee..d33c0cb4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.23-compact.zip
index ef62e9c6a..f5f84072a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.23-legacy.zip
index 774a9f842..6f8d6dd84 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.24-compact.zip
index ecde25f2d..61b8caa13 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.24-legacy.zip
index a62f67dad..eefa422fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.25-compact.zip
index 05fa9b358..dbe4c719f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.25-legacy.zip
index 0cc5dad3b..664405dc9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.26-compact.zip
index c817285a3..d95c83b20 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.26-legacy.zip
index 87d9fb703..1dbd77df2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.3-legacy.zip
index cd77d8a79..45aea51ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.4-legacy.zip
index 094aa77b0..62ee3aa26 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.5-legacy.zip
index b146e870a..969ec8f3d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.6-legacy.zip
index 4aba87ee2..a78c12e77 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.7-legacy.zip
index ba6aab20e..e9965b4d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.8-legacy.zip
index 4419d9d99..673c033a8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.9-legacy.zip
index 5ace5ea88..8067870f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.0-compact.zip
index f7bf5498b..1d4a67233 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.0-legacy.zip
index 933994e25..ffd6b0505 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.1-compact.zip
index 3cee6c700..7ba71ca2a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.1-legacy.zip
index 9b4bf3738..5e459647d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.10-compact.zip
index 4686882f0..703fda8d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.10-legacy.zip
index 9fa0c09c9..52ae95db5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.11-compact.zip
index e8ca1f612..ed1588591 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.11-legacy.zip
index 8ec3e36ed..7fb167a0a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.12-compact.zip
index 8d7774c95..5a427d3aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.12-legacy.zip
index 50de2fe55..24b0dc6bc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.13-compact.zip
index dbecd8e5b..bf5c4a661 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.13-legacy.zip
index 39edda9ea..c7ed65b10 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.14-compact.zip
index b4f6bbf4c..d0210e113 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.14-legacy.zip
index 178d43911..f9940f740 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.15-compact.zip
index da44534ac..d9136b042 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.15-legacy.zip
index 00c56c744..c2d23146d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.16-compact.zip
index 0c6d59dfa..72a9b631e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.16-legacy.zip
index e56194846..ce88bd35f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.17-compact.zip
index bc411b200..7a54184bc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.17-legacy.zip
index ad053e32b..35cfbaded 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.2-compact.zip
index b01b53bf9..12d64ca90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.2-legacy.zip
index d50e25ac3..2bf641a33 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.3-compact.zip
index 269d4e1f3..6e0d48fda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.3-legacy.zip
index 8b53bed01..e07692090 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.4-compact.zip
index 702b4420a..3d131c9f2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.4-legacy.zip
index e56f81e9d..1f9bb2d93 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.5-compact.zip
index 0903486b3..af0a65532 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.5-legacy.zip
index 65736deab..e610d413f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.6-compact.zip
index b3d5371eb..3cbd2d573 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.6-legacy.zip
index 3331411cb..a0cba0c90 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.7-compact.zip
index d8c194e08..ed53645ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.7-legacy.zip
index 2984896a2..9c77f44d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.8-compact.zip
index aabf72669..ccd592eca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.8-legacy.zip
index 87151fd1a..f3bb6b937 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.9-compact.zip
index e52cab586..a0cbab90b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.9-legacy.zip
index 0689807ef..de93ea27b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.0-compact.zip
index 471f9755e..76b47fedd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.0-legacy.zip
index d52b8b717..1a2ba2725 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.1-compact.zip
index 73eafb4f8..b6e4994fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.1-legacy.zip
index 9750deea2..8ec321d1e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.10-compact.zip
index f0d58d6d3..8740cec5d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.10-legacy.zip
index acaa4673e..9451bf01d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.11-compact.zip
index 37804eec0..271f626d6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.11-legacy.zip
index 1328ff583..602487dc2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.12-compact.zip
index e61d1f746..c42982c4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.12-legacy.zip
index 2d1373a0d..50c55f97e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.2-compact.zip
index b4903d6f7..dfa2309dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.2-legacy.zip
index a274f2deb..42d301ab4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.3-compact.zip
index 43a4081d5..34631c3f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.3-legacy.zip
index c9575f659..108800e64 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.4-compact.zip
index a384fd0dc..339112555 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.4-legacy.zip
index c3ab5e035..f91933945 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.5-compact.zip
index 9ea931901..7ea632cbd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.5-legacy.zip
index 8295fefdd..d2c0043c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.6-compact.zip
index 7ece31cca..ccf930095 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.6-legacy.zip
index 94569712b..fdad1b981 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.7-compact.zip
index 83264a48d..4d8ed256d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.7-legacy.zip
index 398ccf075..debb37792 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.8-compact.zip
index 2de3e7ba7..2ebe53084 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.8-legacy.zip
index 9bbb28bd1..9a502645d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.9-compact.zip
index d93ec9336..f65b5a5c2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.9-legacy.zip
index 0bcceccbb..0a68cb622 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.0-compact.zip
index be4f072e5..835796569 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.0-legacy.zip
index c9734f6fa..5cae22bb6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.1-compact.zip
index 158ef5dae..5dba6926a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.1-legacy.zip
index b96ea391d..750956681 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.2-compact.zip
index 68ad0ca38..199b81403 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.2-legacy.zip
index a9f5e9be2..fb138a3ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.3-compact.zip
index bf2eb898e..20875214c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.3-legacy.zip
index ce9d5f0df..f3d60769e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.4-compact.zip
index 1403430e3..5b4635679 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.4-legacy.zip
index e9e0431d0..46f657c04 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.5-compact.zip
index 08c1b9aef..9db69288e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.5-legacy.zip
index ad2e0c217..19f0e09de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.6-compact.zip
index 522ec7fb7..3611dbcdf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.6-legacy.zip
index 04028f2c9..b2ecd2542 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.4.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.0-compact.zip
index 708fa1d0a..3ceed4a36 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.1-compact.zip
index bab22d392..f6592122c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.10-compact.zip
index 68d9ce8a2..61c92c2e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.11-compact.zip
index d7df650a8..5f6201488 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.12-compact.zip
index 173502dfe..fb8e4c952 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.13-compact.zip
index 56c527b01..e644abebf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.14-compact.zip
index 8b4ca708a..d116825e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.15-compact.zip
index 00fa5b640..4caa6dce0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.2-compact.zip
index b45345e48..8efda087e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.3-compact.zip
index 69c445f46..88357938a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.4-compact.zip
index 576ade2ca..fed91db17 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.5-compact.zip
index 10d4206ef..8e2147060 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.6-compact.zip
index 82780b4c9..d3a94910a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.7-compact.zip
index 25c2d8af3..70b3e9252 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.8-compact.zip
index dff002c44..a5a239a05 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.9-compact.zip
index a9d106b89..291bb5d48 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/unchecked-0.8.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.0-legacy.zip
index 670bee45c..52fa99005 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.1-legacy.zip
index d5eec62dd..79028c67b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.10-legacy.zip
index 477c44220..a586167e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.11-legacy.zip
index ae5e685ec..5263a7e95 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.12-compact.zip
index 4e6681f7f..0d3f9dde4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.12-legacy.zip
index ec40cd79b..76c8a19dc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.13-compact.zip
index 208262fe7..980e0ac28 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.13-legacy.zip
index a4d6661a5..6b1ff60d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.14-compact.zip
index 4dfe0b87a..ed5b94149 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.14-legacy.zip
index ade9b6741..b2a7d7fa4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.15-compact.zip
index dd7ae1e71..cc48da36b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.15-legacy.zip
index 3a014e912..a378a9eb4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.16-compact.zip
index 95d88a2e9..c24ba596d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.16-legacy.zip
index 9f5506eee..0c3a2de17 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.17-compact.zip
index e6e798581..564ea982c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.17-legacy.zip
index eed18acf8..022b9000c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.18-compact.zip
index 647d1dfaf..09c36f412 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.18-legacy.zip
index dc83ac7b2..3e028543c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.19-compact.zip
index 95e9296f2..8027af3d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.19-legacy.zip
index 3eb2f0c34..f808c9291 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.2-legacy.zip
index 0ef4edcbf..e6f35f267 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.20-compact.zip
index 1e6e6f42e..d1bac1d84 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.20-legacy.zip
index 16ed2e8b6..67ac78b67 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.21-compact.zip
index 8e7ca3d37..17547436f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.21-legacy.zip
index 7598721d2..8281e38e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.22-compact.zip
index d545774d0..ca22b5b1b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.22-legacy.zip
index 3563e1902..76b50ff28 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.23-compact.zip
index 9ff6d439f..dcd41adf0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.23-legacy.zip
index 54813c4da..f7729542e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.24-compact.zip
index 8b435dc18..371fae51d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.24-legacy.zip
index ae97dc12e..43eb200f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.25-compact.zip
index a1b5ce18a..e1b2500fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.25-legacy.zip
index f3b8baaa7..f2b73dd73 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.26-compact.zip
index a2f8b7ccd..8545a76b2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.26-legacy.zip
index be7101243..a79ef344c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.3-legacy.zip
index b2194db91..59eef2df7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.4-legacy.zip
index 7e6614e4b..05b06f5b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.5-legacy.zip
index 4aece5f52..17c6ffd25 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.6-legacy.zip
index 8d65b48e9..f3900c8d9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.7-legacy.zip
index 5ecc91177..4d9916d6d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.8-legacy.zip
index faa23def2..8035569d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.9-legacy.zip
index f6c76b51b..c6cf9f8f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.0-compact.zip
index 6ef459bc3..34a2191b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.0-legacy.zip
index db1a963a3..f4b4d7b78 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.1-compact.zip
index fd9b7a7ff..96fb14621 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.1-legacy.zip
index 962148882..087a393de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.2-compact.zip
index e4324108d..ea7f50038 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.2-legacy.zip
index 6f7493add..ac4d74a5b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.3-compact.zip
index 7b4b55496..3c211b1bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.3-legacy.zip
index d5c45255b..c9fc23c3a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.10-compact.zip
index 85caec2ca..a84371d4b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.10-legacy.zip
index 1aec75a91..5dd8c461d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.11-compact.zip
index 890937a3b..6bf1ef870 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.11-legacy.zip
index ef324e6f0..5063e1ca1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.12-compact.zip
index e600b1200..825351a92 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.12-legacy.zip
index 3425d06cb..37bd2fde9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.13-compact.zip
index 972fd0b3a..c08bc3b79 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.13-legacy.zip
index 91769af0a..5073ddb2d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.14-compact.zip
index eca803d05..f1f02f2a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.14-legacy.zip
index fa38eac34..368fe50ed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.15-compact.zip
index b98d599e9..64465b20b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.15-legacy.zip
index 4da6b01ee..53ef21c95 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.16-compact.zip
index b1d7d6600..42ff09f2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.16-legacy.zip
index c588a5784..c46a2f52e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.17-compact.zip
index 15269f391..8b995d039 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.17-legacy.zip
index 370fbd5ae..41524c9f2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.4-compact.zip
index f7d93c265..1cf1d3086 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.4-legacy.zip
index 2efab487c..ef62f1d7e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.5-compact.zip
index a9e80c0e4..8045372b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.5-legacy.zip
index 2b544251b..395d9ebf2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.6-compact.zip
index 1fa68c7b7..4d4485e96 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.6-legacy.zip
index 909b3e3d8..936b24eb2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.7-compact.zip
index 3151671bd..ec533560f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.7-legacy.zip
index 0ca754793..69b62ba40 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.8-compact.zip
index aa31b9525..8052b45f2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.8-legacy.zip
index 2e203e652..75c114e66 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.9-compact.zip
index 9c40d52b8..687853328 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.9-legacy.zip
index 183c63bfb..229a7678e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.5.4.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.0-compact.zip
index 612546a90..8f1c46f91 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.0-legacy.zip
index 5ce3aa21c..e1b2074be 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.1-compact.zip
index b1f3b230c..f38300a2e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.1-legacy.zip
index edf7277d0..5409d1988 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.10-compact.zip
index a84a27b3f..74123247b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.10-legacy.zip
index afb913f69..7b049797e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.11-compact.zip
index a1ee385c2..112a64947 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.11-legacy.zip
index 979603f21..368115fcf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.12-compact.zip
index d90598a7c..4bc118fbc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.12-legacy.zip
index 18ca754e2..97826a0d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.2-compact.zip
index 32c54b8c7..4d28514e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.2-legacy.zip
index c0bedbcdf..74b15c61c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.3-compact.zip
index 44e3b4620..fb942e085 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.3-legacy.zip
index 9811d3329..9ef536b91 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.4-compact.zip
index 9c17046fb..60c6bc400 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.4-legacy.zip
index d1d306c45..92535883c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.5-compact.zip
index 8913b5ff1..9e5f9769b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.5-legacy.zip
index d835c8e9c..844df2967 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.6-compact.zip
index deeb2e34e..def1fdb9f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.6-legacy.zip
index 31b43054a..d5d6292a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.7-compact.zip
index 7c3bd2081..1f7bd315c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.7-legacy.zip
index d9c2a5862..047d42f9b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.8-compact.zip
index c43e62d8b..6d3dbf3b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.8-legacy.zip
index 87936c331..251cc08f3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.9-compact.zip
index 13944916f..ce0ffe3dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.9-legacy.zip
index ffc22c3c0..394e0a853 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.6.0.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.0-compact.zip
index ff362d5eb..5c60431f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.0-legacy.zip
index a1c99c8c6..6a167e874 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.1-compact.zip
index 593187c6b..37b3e7950 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.1-legacy.zip
index fd839495b..d6a3dfe0a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.2-compact.zip
index 92308cddd..085c7e61b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.2-legacy.zip
index 71b311be0..be8941db7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.3-compact.zip
index f6a72d470..5d3828ee3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.3-legacy.zip
index fe9ea22bd..24e5087cf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.4-compact.zip
index b411d6ab7..e1ca047fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.4-legacy.zip
index 3eb922b74..1f8f50470 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.5-compact.zip
index 7cd5ea748..91485b245 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.5-legacy.zip
index 9716b70b6..2324c12d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.6-compact.zip
index 299d79174..7f5830e86 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.6-legacy.zip
index cbe24b16d..7c05f8b2a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.7.0.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.0-compact.zip
index f5e5bcb90..0c369c5db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.1-compact.zip
index 722140918..78c794f51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.10-compact.zip
index 4b16c9594..a5474535a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.11-compact.zip
index 3ee5a987c..f75a75d73 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.12-compact.zip
index 9cb944a9c..88b7901d1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.13-compact.zip
index 94a3448cf..f83308363 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.14-compact.zip
index 8286203ce..fbff407ad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.15-compact.zip
index 4259f0ebe..3640c268a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.2-compact.zip
index 223e017c4..70cd76074 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.3-compact.zip
index a68abc647..1b63ecfe1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.4-compact.zip
index f1b9247dc..975f8190a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.5-compact.zip
index 346812307..88ea20a1f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.6-compact.zip
index 394096e69..2b3a8a452 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.7-compact.zip
index ba082e9cb..f3f90c614 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.8-compact.zip
index f9f6cb5a6..19340a707 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.9-compact.zip
index 269c3320f..237b0484f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.4.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.4.sol-0.8.4-compact.zip
index 2e2f21180..35948694b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.4.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.4.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.4.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.4.sol-0.8.5-compact.zip
index 424dd6757..0d545f30b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.4.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.4.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.4.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.4.sol-0.8.6-compact.zip
index 44f86a320..522f438ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.4.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.4.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.7.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.7.sol-0.8.7-compact.zip
index d2089edb2..b00f0a708 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.7.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.7.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.7.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.7.sol-0.8.8-compact.zip
index bf52ef3b5..ab63bece5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.7.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.7.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.7.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.7.sol-0.8.9-compact.zip
index a8e8dd177..7437a3876 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.7.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/units_and_global_variables-0.8.7.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.10-compact.zip
index b65e511ef..19dac6cec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.11-compact.zip
index c9a78fcea..b223c51d9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.12-compact.zip
index 1b69e8e3d..4d0f6bb27 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.13-compact.zip
index 5661f465d..9e9c8c1fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.14-compact.zip
index cf4950769..d94ab8b52 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.15-compact.zip
index 16236fd22..a9512b393 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.8-compact.zip
index d574a7cb8..89d295d4c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/abi-decode-fixed-array.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.10-compact.zip
index a1d4b0919..9f090673f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.11-compact.zip
index 5b0bfc860..475c507de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.12-compact.zip
index c4be608bc..489401829 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.13-compact.zip
index 56841fbaf..900d55c87 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.14-compact.zip
index 131c5769e..631fbb1f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.15-compact.zip
index f8bdf9dee..c99c60786 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.8-compact.zip
index a74b49ac1..c4bdd1954 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/argument-0.8.8.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.10-compact.zip
index 57273022f..3353cf460 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.11-compact.zip
index c69a936a3..0a2675615 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.12-compact.zip
index 277036849..bec715f40 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.13-compact.zip
index b17496fc4..6a4d278a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.14-compact.zip
index fa8734b4e..6122b6dab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.15-compact.zip
index a43ca6b0f..a7f19b97b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.8-compact.zip
index 4b98a2bc6..9e8bdcca2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/calldata-0.8.8.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.10-compact.zip
index 4f7e800b1..41b16d011 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.11-compact.zip
index 24b01b8df..cdaca2b96 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.12-compact.zip
index 43f760749..3d3176698 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.13-compact.zip
index 647d124a4..e3c44872c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.14-compact.zip
index 50f2cc275..c5d7c4728 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.15-compact.zip
index 652617a3d..06321dc2f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.8-compact.zip
index d98aa7751..3a62bda4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/constant-0.8.8.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.10-compact.zip
index c65376963..33b15fb76 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.11-compact.zip
index 51e60eb27..016fb52ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.12-compact.zip
index c9e8559cd..6c97e5855 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.13-compact.zip
index 36b5e0143..0653b9380 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.14-compact.zip
index a0d3a394b..5c87a4054 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.15-compact.zip
index 41dd2566c..924e42d4a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.8-compact.zip
index 1752e6322..f9904c33f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/erc20-0.8.8.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.10-compact.zip
index 0d3ca25a0..ec2d46bf1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.11-compact.zip
index ec8b66df7..d0da177a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.12-compact.zip
index a9f8231db..962a8c031 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.13-compact.zip
index 65636b54f..2a0c739e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.14-compact.zip
index aaff7aec6..09b58b8ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.15-compact.zip
index b9272ba0c..b8c1faa2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.8-compact.zip
index 56b368c60..937dc660a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/in_parenthesis-0.8.8.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.10-compact.zip
index 38be57cf8..942f61651 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.11-compact.zip
index e6a5439a3..8dbd7d52a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.12-compact.zip
index 8f3c5c654..ada9d1968 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.13-compact.zip
index 4f8ef1b38..535721e5e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.14-compact.zip
index 12359abb5..faf679d26 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.15-compact.zip
index 4de1fa4ac..0dd354d2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.8-compact.zip
index 8e1d0716a..20e75ed8c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/top-level-0.8.8.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.10-compact.zip
index 89a626934..a257d745b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.11-compact.zip
index b261726c8..05d8e2704 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.12-compact.zip
index 751c2cf7c..4e2bc78f8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.13-compact.zip
index 3c05dbea0..7255baade 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.14-compact.zip
index 366277c68..5fb0e1f71 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.15-compact.zip
index 04156bb2a..c390f2764 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.8-compact.zip
index 658877ed7..b38ab9526 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/user_defined_types-0.8.8.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.10-compact.zip
index 2dedfd0a6..d13197f62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.11-compact.zip
index 373ed8650..dbe50524c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.12-compact.zip
index 573f4efc0..d3da0c6ec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.13-compact.zip
index 798230e9c..da0b0e304 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.14-compact.zip
index db90bfcab..aa4d911db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.15-compact.zip
index 3d3a0f0b2..732ed732b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.8-compact.zip
index 89d650f85..6f5b8c2ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/user_defined_value_type/using-for-0.8.8.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.0.sol-0.4.0-legacy.zip
index 33f351861..97dc75b02 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.1-legacy.zip
index e085764f2..77563e93c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.10-legacy.zip
index 308daf50f..de788f97f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.11-legacy.zip
index fec427a8b..9faba84fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.12-compact.zip
index 0a20ecfc4..4255ee6e0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.12-legacy.zip
index 07414eeaa..a63209c85 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.13-compact.zip
index d87e395ba..2fb60b309 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.13-legacy.zip
index c50c7d958..ac2cb3bbc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.14-compact.zip
index 92925721b..264b15581 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.14-legacy.zip
index 700a55dcd..011669bc2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.15-compact.zip
index 004aa5875..465f63874 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.15-legacy.zip
index 0751d85c1..d767435c4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.16-compact.zip
index 82b5c2a7e..03f43be44 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.16-legacy.zip
index cfc00c404..d70820930 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.17-compact.zip
index 870598d1e..49e76508c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.17-legacy.zip
index 45582066a..e95282015 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.18-compact.zip
index 82cc4271b..fbea5c22b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.18-legacy.zip
index 46ebe3453..cf25851c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.19-compact.zip
index b87f5fbfb..d6d111dd7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.19-legacy.zip
index 8c491b7a9..9cb4b2bbf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.2-legacy.zip
index c5dbb9d1e..a0c69808c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.20-compact.zip
index c530ea2a3..4d144035b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.20-legacy.zip
index bfd9ab91a..07d224bc7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.21-compact.zip
index 301b9dcd3..26577bae2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.21-legacy.zip
index 95f26c5d6..3e660531e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.22-compact.zip
index d14271f20..9ceee7ef3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.22-legacy.zip
index 5d56ab32a..23bcd9711 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.23-compact.zip
index b2d81f35d..848bf05fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.23-legacy.zip
index b6f1e6a46..a771b79e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.24-compact.zip
index ccc038d9e..8eae4b406 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.24-legacy.zip
index a3d075d5e..518b312f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.25-compact.zip
index ee0f575ba..50ccacb0b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.25-legacy.zip
index 2e5aed0a4..cec42e112 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.26-compact.zip
index 946d92ae2..bc2825582 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.26-legacy.zip
index 090b6e9b9..49f602591 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.3-legacy.zip
index 7f3f65e2e..60fd2d616 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.4-legacy.zip
index 5af92f64a..49f4a7915 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.5-legacy.zip
index c8a3fb2f2..dd5224510 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.6-legacy.zip
index 741598554..f85439fe4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.7-legacy.zip
index bb5915de1..b9a3f5fce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.8-legacy.zip
index 59696362d..b4eac54a6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.9-legacy.zip
index 33cdb06b5..bbd8717fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.0-compact.zip
index c58d03467..17353ae1e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.0-legacy.zip
index 4678038bb..7fe9655b1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.1-compact.zip
index df3b81b99..47ac9edef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.1-legacy.zip
index 06f842288..7a4398d13 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.10-compact.zip
index 07d628b96..311bec8ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.10-legacy.zip
index 07a96fe73..e263241c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.11-compact.zip
index b0629f9be..d4d2f3447 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.11-legacy.zip
index 8b528fa4b..04aa2a593 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.12-compact.zip
index 10819db11..696c9e3fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.12-legacy.zip
index 2cd3ed8d8..2c5900249 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.13-compact.zip
index 8d63b2c66..ef900c9ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.13-legacy.zip
index 77c4aad53..b0af5a8d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.14-compact.zip
index 4aa156dae..461280fb9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.14-legacy.zip
index 45cc0a760..a8aca4c43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.15-compact.zip
index fcc999834..14dfc7676 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.15-legacy.zip
index acc625471..f6823a8d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.16-compact.zip
index 0a2c5c67a..5879375cc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.16-legacy.zip
index ca4d5c607..f8b2a6e50 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.17-compact.zip
index 48cd91ae6..dfd97df85 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.17-legacy.zip
index f91d9a672..005fd05e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.2-compact.zip
index ba509f4aa..e6099eca1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.2-legacy.zip
index 96be515b0..48c57f6c9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.3-compact.zip
index 1bea131eb..a0627d434 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.3-legacy.zip
index 777c83524..abf4fefc6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.4-compact.zip
index 67a30ec21..c008ddf36 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.4-legacy.zip
index 0f42a61ae..9a7d141db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.5-compact.zip
index 004db7d7a..66d7022f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.5-legacy.zip
index 62747c205..8b19f82aa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.6-compact.zip
index ddd129aa5..f4ca10aaf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.6-legacy.zip
index a9fc537f6..4792c0ba1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.7-compact.zip
index 8bb51f3f2..d225abc0e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.7-legacy.zip
index ed25cbe87..071af97b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.8-compact.zip
index f5c20891b..53a4dd8df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.8-legacy.zip
index 309b6ad77..1b4a2702a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.9-compact.zip
index 31a644258..36093bb1d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.9-legacy.zip
index f2310fbe2..9e80b6be7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.0-compact.zip
index e67e5824a..af728a743 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.0-legacy.zip
index 6ff75a29c..8892ce610 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.1-compact.zip
index 9a02afe23..4634535a1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.1-legacy.zip
index 308541f69..a9bb343fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.10-compact.zip
index f0b454e25..36a9301fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.10-legacy.zip
index 00af0f5a9..3280da2f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.11-compact.zip
index 508c88d7e..8b31e201d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.11-legacy.zip
index 34e91cf96..36226a79e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.12-compact.zip
index c1df145fd..e61766c88 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.12-legacy.zip
index 63ab02372..2f3979059 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.2-compact.zip
index 305dc4c0f..57aec6f5b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.2-legacy.zip
index 2320c7a7c..e30b3fb6d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.3-compact.zip
index 32df950f4..63d087d1e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.3-legacy.zip
index b3866e003..143b6362d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.4-compact.zip
index ef1f2eb72..e8d306eab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.4-legacy.zip
index 99fae8da0..7eb4b9589 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.5-compact.zip
index 43431cf11..5e6d28120 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.5-legacy.zip
index 3cb7ca614..33f0a232d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.6-compact.zip
index 2db545add..fc31760f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.6-legacy.zip
index adc8645ae..e3a470878 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.7-compact.zip
index 6fbd55dc2..787c45976 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.7-legacy.zip
index 365f00301..264278bdc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.8-compact.zip
index 871579b6b..aaaa7edb4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.8-legacy.zip
index 9f666ee4b..fc13fa1b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.9-compact.zip
index 01022a59f..018e31f67 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.9-legacy.zip
index 7e813f83a..44044b02d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.0-compact.zip
index 9aacb844f..fc5c42273 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.0-legacy.zip
index f8760bf7d..b825a8a7e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.1-compact.zip
index 69e0432a9..1a2c0f217 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.1-legacy.zip
index 729223144..ddb87d44a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.2-compact.zip
index 2680766e2..364673e70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.2-legacy.zip
index 5e626f67e..7111878f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.3-compact.zip
index 0d6c8e45c..c14d42fc9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.3-legacy.zip
index 677bcc8d6..9d7631b10 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.4-compact.zip
index 3508ef961..7eec50ce1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.4-legacy.zip
index e2d8647e4..280220829 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.5-compact.zip
index 53267e481..1e2b61639 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.5-legacy.zip
index 7391ec891..d8411de4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.6-compact.zip
index 8ece53fa5..fb0e7afa9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.6-legacy.zip
index 0fadb218f..c38465e3f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.0-compact.zip
index 01202274b..2fe6ebb8e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.1-compact.zip
index 0ec389c29..216ab5b8a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.10-compact.zip
index 3c0ce6161..e9a51b598 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.11-compact.zip
index b3736410b..4ced2b1b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.12-compact.zip
index a9e996182..3d6b62999 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.13-compact.zip
index dd3068c7f..d7d970887 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.14-compact.zip
index 22e37251d..95e5d8b9e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.15-compact.zip
index f6aeaaba7..5cd33b2f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.2-compact.zip
index c715a54bd..40825c31a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.3-compact.zip
index cf38168b4..639e71c6a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.4-compact.zip
index b722950ac..8a6964645 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.5-compact.zip
index 94b5bfc39..3266605ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.6-compact.zip
index 3c5056d2a..0bf53fabd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.7-compact.zip
index 383aee80b..b0ab71d2e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.8-compact.zip
index 3ca34f51a..f66a9cbb5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.9-compact.zip
index 68fb03fd5..ecd3a91a1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-0.4.1.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-1-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-1-0.8.0.sol-0.8.15-compact.zip
index 6505c61e0..97d9f2479 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-1-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-1-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-2-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-2-0.8.0.sol-0.8.15-compact.zip
index 7c6a28020..b0b80d38a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-2-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-2-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-3-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-3-0.8.0.sol-0.8.15-compact.zip
index e51c777db..e4e620bdf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-3-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-3-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-4-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-4-0.8.0.sol-0.8.15-compact.zip
index 12452d862..671d89273 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-4-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-4-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-alias-contract-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-alias-contract-0.8.0.sol-0.8.15-compact.zip
index c460e057f..b72312c77 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-alias-contract-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-alias-contract-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-alias-top-level-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-alias-top-level-0.8.0.sol-0.8.15-compact.zip
index 4a0cfea17..fd198dee0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-alias-top-level-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-alias-top-level-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-1-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-1-0.8.0.sol-0.8.15-compact.zip
index 6a6064a15..6dec1ac39 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-1-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-1-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-2-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-2-0.8.0.sol-0.8.15-compact.zip
index 33ce99146..b1ccc67ae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-2-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-2-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-3-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-3-0.8.0.sol-0.8.15-compact.zip
index 3944ab586..9ab99fc65 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-3-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-3-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-4-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-4-0.8.0.sol-0.8.15-compact.zip
index 8889d83fb..99f09cbb5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-4-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-functions-list-4-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-global-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-global-0.8.0.sol-0.8.15-compact.zip
index baef95605..fd2b39e40 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-global-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-global-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/using-for-in-library-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/using-for-in-library-0.8.0.sol-0.8.15-compact.zip
index ca32c7583..24c62c3e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/using-for-in-library-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/using-for-in-library-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.0-legacy.zip
index f8c2e9958..930accf60 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.1-legacy.zip
index 05877fbcb..681db69b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.10-legacy.zip
index ce9feff43..a6d08402b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.11-legacy.zip
index a93390e05..c4321909f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.12-compact.zip
index 42686a5ce..01bece9fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.12-legacy.zip
index 939a5a505..117690708 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.13-compact.zip
index 3cecb656a..6e23a1466 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.13-legacy.zip
index ebb14134d..4ab03f0d5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.14-compact.zip
index 975ef8ad7..39d2af731 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.14-legacy.zip
index bfcb02df7..b7dff6c47 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.15-compact.zip
index 52809b38f..e64f26cfa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.15-legacy.zip
index e708ccf3b..058ea4bc4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.16-compact.zip
index 3972f269e..ecddbbfa9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.16-legacy.zip
index 03e96cdb2..8dd9ec0fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.17-compact.zip
index ab30b3a55..67ae64fad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.17-legacy.zip
index 2cbd19a38..a1dd1f79e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.18-compact.zip
index 80c477ee3..9ce0270e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.18-legacy.zip
index 7250488ba..dca821113 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.19-compact.zip
index 60f46bb15..58353de47 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.19-legacy.zip
index a0e341d4e..82685fa4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.2-legacy.zip
index f4ca5fbc9..3770904b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.20-compact.zip
index 05853d768..02bf4aac0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.20-legacy.zip
index 59d2e75e4..a1759d356 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.21-compact.zip
index 73b7ca838..3538a076d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.21-legacy.zip
index ff76e3077..7ddafec76 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.22-compact.zip
index 48d9f60ae..97730a585 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.22-legacy.zip
index e52584812..a16f76739 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.23-compact.zip
index a96e56a05..87a6112fe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.23-legacy.zip
index 276f0f5e4..8cb5431e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.24-compact.zip
index 6bfa09e5c..d66ad52b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.24-legacy.zip
index 09c8e3f1f..b39bc3b06 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.25-compact.zip
index 801aa4022..ec3f71979 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.25-legacy.zip
index 57c1aef61..414aac5e5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.26-compact.zip
index 074e4dc30..55c085293 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.26-legacy.zip
index f56f18ca6..091b86c7a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.3-legacy.zip
index 4423ec820..dfa384c73 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.4-legacy.zip
index 30a938531..bdd0d50b3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.5-legacy.zip
index c6c35afc8..8a66609c0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.6-legacy.zip
index a7e022f49..d685205f7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.7-legacy.zip
index b12a245b0..73a784523 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.8-legacy.zip
index e2f7b74ff..05aa811b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.9-legacy.zip
index 525bda581..5f7205233 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.0.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.14-compact.zip
index a12d6a750..39a6f287a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.14-legacy.zip
index afb763109..de60071f9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.15-compact.zip
index 1cfeada1e..6a0c03128 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.15-legacy.zip
index 6c0b39321..8356a4bf5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.14.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.16-compact.zip
index d83a26dad..7bb6fbf63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.16-legacy.zip
index d30d24447..c75b08dd8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.17-compact.zip
index 8b7cc89ce..10338f6de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.17-legacy.zip
index d7ba87a3c..921f4be5b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.18-compact.zip
index b1e9181d4..bd87d011b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.18-legacy.zip
index e93fcc36d..3d4a03bea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.19-compact.zip
index 9f7e91080..580869688 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.19-legacy.zip
index 7902db60e..0ea227b44 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.20-compact.zip
index 330fcac26..d0700d039 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.20-legacy.zip
index 021ac3435..47eead07e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.21-compact.zip
index d0cde3189..7693a0e9e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.21-legacy.zip
index c7c0c3994..ff36b7d58 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.22-compact.zip
index 0ecabe1eb..c869b663e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.22-legacy.zip
index cc9734196..436522bc9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.23-compact.zip
index 3ac71b570..fd8954d9a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.23-legacy.zip
index 4fafa67d9..0a09a933c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.24-compact.zip
index 064e33880..976029045 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.24-legacy.zip
index 331e22d0f..a9e6aead8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.25-compact.zip
index 1b61359a8..b9c54ba6b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.25-legacy.zip
index 1ad1c7199..9437b2d9a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.26-compact.zip
index 8dbfeaa0a..49ea51a54 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.26-legacy.zip
index 276584977..141729268 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.16.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.10-legacy.zip
index 9c69e7e3e..b6cbf639d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.11-legacy.zip
index b31b81d54..924149b4d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.12-compact.zip
index f1c16756f..b2fa0962a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.12-legacy.zip
index 6acdfb038..19be201f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.13-compact.zip
index 3e96e891e..e2e29f6a4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.13-legacy.zip
index 94fd83ab1..befce5027 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.5-legacy.zip
index 5a6fbea24..8cb690a8c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.6-legacy.zip
index bf6cb7d0f..3c67bb1ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.7-legacy.zip
index 0b791fb87..6652f686d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.8-legacy.zip
index db67e1b77..70d686a1e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.9-legacy.zip
index 8fee98dbe..ab76241fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.4.5.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.0-compact.zip
index f52ac1555..ddd530f32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.0-legacy.zip
index 1dd64dffd..278da240c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.1-compact.zip
index bfe90d31c..1124e72c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.1-legacy.zip
index f87f28a2b..408cc3eb6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.10-compact.zip
index 61da343dd..b98190687 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.10-legacy.zip
index a2bb07028..967a7062e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.11-compact.zip
index 14ddc1b06..16ac8c469 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.11-legacy.zip
index b0fa16055..f9e25751f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.12-compact.zip
index a64e91a5e..c7e7bffcb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.12-legacy.zip
index 1de9fbdcb..e75bb0207 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.13-compact.zip
index d61541ab1..8aee2fa83 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.13-legacy.zip
index 299cd2630..f1cfa0cc5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.14-compact.zip
index b8215245e..d3be55e9e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.14-legacy.zip
index 781a36722..27445fe33 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.15-compact.zip
index 4ed13e5c4..94f1a9be5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.15-legacy.zip
index 79b3b3d52..d19bd1e42 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.16-compact.zip
index 6b7272493..90cf874f1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.16-legacy.zip
index 0b5318699..c10339c2c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.17-compact.zip
index b5b4e7eb1..73a4f79fd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.17-legacy.zip
index f16c05350..73bece7fa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.2-compact.zip
index 6e3b843f8..a1fe1924e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.2-legacy.zip
index b41f36a09..9b78e5ba4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.3-compact.zip
index 6bd679c6d..1fd5e6dc4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.3-legacy.zip
index dc6ad17f3..13296bc21 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.4-compact.zip
index 2c818d4b9..e1d98e8a0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.4-legacy.zip
index 51ce05ce8..ccc5bea76 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.5-compact.zip
index 44c9a0ff0..d0f79ca3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.5-legacy.zip
index 23a2eec03..ac14ba744 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.6-compact.zip
index 800ceea10..2c5bf0dbf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.6-legacy.zip
index 62f051f3b..5c5f0335a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.7-compact.zip
index 7bb065c5f..3cd158f84 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.7-legacy.zip
index 403e6a255..aed605250 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.8-compact.zip
index b1afea5d5..32cfb94bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.8-legacy.zip
index 11cf299cb..bbdfe4103 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.9-compact.zip
index e07a35104..41d1b7dc0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.9-legacy.zip
index 4b66a1d94..51f5b6bda 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.0-compact.zip
index e679f8dce..a344a9ac3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.0-legacy.zip
index dff6ebd52..585df4f27 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.1-compact.zip
index d3fdbdd19..d864f8217 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.1-legacy.zip
index 9b6752bfd..6d0d9c7c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.2-compact.zip
index 881676c51..a36b129fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.2-legacy.zip
index dbda92b50..1a771ceed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.3-compact.zip
index 80a36774a..0115ef178 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.3-legacy.zip
index 196a70c80..181d9c550 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.4-compact.zip
index 04a64e75d..e460d053a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.4-legacy.zip
index 23bc214ca..cabf40a2d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.5.0.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.5-compact.zip
index f4160ff40..b3b03ac3a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.5-legacy.zip
index e1f7070c3..5d1a85118 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.6-compact.zip
index 5dacf56f0..e7519ffe9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.6-legacy.zip
index 1181f50c2..44344246e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.7-compact.zip
index 6fdcc3d9c..7379310b5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.7-legacy.zip
index b05680116..1cbde3050 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.8-compact.zip
index 067dc4539..0b97eed91 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.8-legacy.zip
index 64c903b87..64969e340 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.5.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.10-compact.zip
index 268e8627a..1463d3610 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.10-legacy.zip
index 80b7f0d60..c68c87812 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.11-compact.zip
index cc740ad97..fbbe7b4b8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.11-legacy.zip
index d7a5a745b..362027ae2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.12-compact.zip
index cd4d50139..334c44dfe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.12-legacy.zip
index b4d0e3c91..426a218a9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.9-compact.zip
index b0d800c2f..115315417 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.9-legacy.zip
index c91e2903d..f32482b58 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.0-compact.zip
index 0842fabc0..e20c8911a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.0-legacy.zip
index 311fa2a91..57defd5fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.1-compact.zip
index bd6ba47c6..2668f56fb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.1-legacy.zip
index 88533380b..f23aa479a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.2-compact.zip
index 2c2c99733..eaddad4d2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.2-legacy.zip
index c718564f7..b83b4c264 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.3-compact.zip
index f08f31075..ef68e0460 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.3-legacy.zip
index 77b8f779e..dc7bbe16c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.4-compact.zip
index 26d45812e..ed82926bf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.4-legacy.zip
index 871fea313..9ba239980 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.5-compact.zip
index 81e6d8671..f7d2fa0a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.5-legacy.zip
index 25d9573bb..36834176c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.6-compact.zip
index a740ea7ac..6c9e860c7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.6-legacy.zip
index d92d38966..ffbb5a350 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.6.9.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.0-compact.zip
index dc54a6a1d..27246ced0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.1-compact.zip
index 7670f9156..b39f2ca3a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.10-compact.zip
index c7a0a68fa..7cf651d12 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.11-compact.zip
index cb4508b73..d66d5fa7c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.12-compact.zip
index 1909f90aa..8c4329e14 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.13-compact.zip
index 87e778600..f04d09aa8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.14-compact.zip
index 28d524570..95e1b0d31 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.15-compact.zip
index d3db72a58..a6ea3ab47 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.2-compact.zip
index e40b1648f..9c1e4c6e7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.3-compact.zip
index dbf58bc6c..b3bd90759 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.4-compact.zip
index cda1e8057..154ba233c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.5-compact.zip
index fc2201b9e..a926e63ed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.6-compact.zip
index 80e97fbc2..dbd0cb016 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.7-compact.zip
index 16b9b1256..1fff4a192 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.8-compact.zip
index 5c9edf77e..1bbd94228 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.9-compact.zip
index 43ab04d49..fd95b6a8e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variable-0.8.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.0-compact.zip
deleted file mode 100644
index 6e2da6cb0..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.0-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.1-compact.zip
deleted file mode 100644
index 2902a64e9..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.1-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.10-compact.zip
deleted file mode 100644
index 1ad75570d..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.10-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.11-compact.zip
deleted file mode 100644
index 5d9317130..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.11-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.12-compact.zip
deleted file mode 100644
index 82fea2f39..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.12-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.13-compact.zip
deleted file mode 100644
index ce3a0fa37..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.13-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.14-compact.zip
deleted file mode 100644
index 844aad69a..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.14-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.15-compact.zip
deleted file mode 100644
index 0c6b055fc..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.15-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.16-compact.zip
deleted file mode 100644
index d48678ec9..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.16-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.17-compact.zip
deleted file mode 100644
index e9d6808fd..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.17-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.18-compact.zip
deleted file mode 100644
index 6713def50..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.18-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.19-compact.zip
deleted file mode 100644
index f241f3601..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.19-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.2-compact.zip
deleted file mode 100644
index 22c777129..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.2-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.20-compact.zip
deleted file mode 100644
index 26553cdce..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.20-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.21-compact.zip
deleted file mode 100644
index 127c3834c..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.21-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.22-compact.zip
deleted file mode 100644
index d272f1f96..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.22-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.23-compact.zip
deleted file mode 100644
index 15da72e04..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.23-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.3-compact.zip
deleted file mode 100644
index 9145adb16..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.3-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.4-compact.zip
deleted file mode 100644
index 58e6bfe5a..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.4-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.5-compact.zip
deleted file mode 100644
index 7fa796efe..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.5-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.6-compact.zip
deleted file mode 100644
index 309ad359e..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.6-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.7-compact.zip
deleted file mode 100644
index e843303c9..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.7-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.8-compact.zip
deleted file mode 100644
index ef5ac0632..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.8-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.9-compact.zip
deleted file mode 100644
index 36d05b325..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.0.sol-0.4.9-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.24.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.24.sol-0.4.24-compact.zip
deleted file mode 100644
index f8154c727..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.24.sol-0.4.24-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.24.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.24.sol-0.4.25-compact.zip
deleted file mode 100644
index 7fa98ac3c..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.24.sol-0.4.25-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.24.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.24.sol-0.4.26-compact.zip
deleted file mode 100644
index 6e4f2fd10..000000000
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.4.24.sol-0.4.26-compact.zip and /dev/null differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.0-compact.zip
index bd2922615..864a0c469 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.1-compact.zip
index e0cc90361..42388cffa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.10-compact.zip
index 7a4518030..7b1b013a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.11-compact.zip
index 6969bb481..4af8fd527 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.12-compact.zip
index 57942a996..31132db43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.13-compact.zip
index 7f3162ea4..813b9112b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.14-compact.zip
index cf9802e34..ceb352e55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.15-compact.zip
index f93480482..11bb3df54 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.16-compact.zip
index fbf669c89..094836430 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.17-compact.zip
index c86240e54..37803746d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.2-compact.zip
index 940b4a9b5..e5715e353 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.3-compact.zip
index ab629eb27..22e24791a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.4-compact.zip
index ddcd2b93c..248381fd7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.5-compact.zip
index b6cad1369..d4f1486e3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.6-compact.zip
index e4d722f57..d5538f181 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.7-compact.zip
index 02bfdb776..798de23e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.8-compact.zip
index 0df31df53..1af3d26ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.9-compact.zip
index 1744f1f43..d0d151c50 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.0-compact.zip
index dd4810ae8..2da317c9b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.1-compact.zip
index 2e252a716..d3d6ec6ac 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.10-compact.zip
index f552300a3..ba770351f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.11-compact.zip
index 90c56a5b8..a77379484 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.12-compact.zip
index b038d84e9..dbd8780dc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.2-compact.zip
index 9497e3b62..e49e93d07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.3-compact.zip
index 5c2dfafb5..581bc7f55 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.4-compact.zip
index 97ac3bc88..af213748c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.5-compact.zip
index 1b6ca4bff..56fe982e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.6-compact.zip
index 1db23c593..5125e57f6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.7-compact.zip
index b23697e88..b28dc37bb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.8-compact.zip
index 2d05ef860..16236b209 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.9-compact.zip
index 100b0b72d..7af8d007f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.0-compact.zip
index 8e584bf6c..68c92a090 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.1-compact.zip
index fcb5e6eaa..61060388b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.2-compact.zip
index 8a2325f53..ba034d5b4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.3-compact.zip
index d3c316b8e..151f21b76 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.4-compact.zip
index bb2b170f8..ced0ed253 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.5-compact.zip
index ed65b29e5..29c7cba1e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.6-compact.zip
index 52273dcbe..2bfb41ca6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.0-compact.zip
index de4a60933..e67e9f3ff 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.1-compact.zip
index afaff6fcf..2c2185381 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.10-compact.zip
index e0c6079c7..0bc22fecb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.11-compact.zip
index 5dcec9281..52137922b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.12-compact.zip
index a086c6580..c5124abec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.13-compact.zip
index c6aa3e7c0..3614b38b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.14-compact.zip
index 298087fea..2259449d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.15-compact.zip
index 090799067..3c63bf058 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.2-compact.zip
index 807b10cf4..beb509925 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.3-compact.zip
index 123517e67..67d986442 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.4-compact.zip
index 46e19072a..eb6a600de 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.5-compact.zip
index 5056dabf6..2ade76c2f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.6-compact.zip
index 4e81978f0..0ce977de0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.7-compact.zip
index b120af64f..867254ca2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.8-compact.zip
index 66af1d3d7..1cac40f9b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.9-compact.zip
index 12947e58f..0feaabae7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/variabledeclaration-0.5.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.0-legacy.zip
index dfcbe1a9d..dd266db29 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.1-legacy.zip
index 1e21ed9f2..8cb5f3049 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.10-legacy.zip
index 886615e7c..d0c2d5280 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.11-legacy.zip
index d39b277dc..4a8c16f23 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.12-compact.zip
index 31fea6df8..3cbfd251c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.12-legacy.zip
index 4a9c60829..6968d1c6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.13-compact.zip
index 8b1b8e036..1cb3e1443 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.13-legacy.zip
index 291c66358..a354a8bba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.14-compact.zip
index 7f56eb29e..67f68641d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.14-legacy.zip
index abfc648fa..96190c411 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.15-compact.zip
index 7a64605cd..6c6238722 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.15-legacy.zip
index fc5393410..6871ef9d9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.16-compact.zip
index e8f299e83..f57f1e9e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.16-legacy.zip
index 2eed7f9ba..f810f0794 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.17-compact.zip
index c10e283f5..adbda9cd5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.17-legacy.zip
index 487d7822e..163abd5b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.18-compact.zip
index 795ea8028..5ec1b2ecb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.18-legacy.zip
index 401e81d5f..680d94105 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.19-compact.zip
index 143e13001..ff7c08839 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.19-legacy.zip
index 5cf43c69d..771069b18 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.2-legacy.zip
index b73d931fa..45219d54c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.20-compact.zip
index 7d3de648a..116cfa1b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.20-legacy.zip
index ee14db0a1..011edaa43 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.21-compact.zip
index b7e49ef65..cd95795e2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.21-legacy.zip
index 845b4dd51..b8eca468d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.22-compact.zip
index 27d060f0c..364075f52 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.22-legacy.zip
index 6ddaf496a..83094e010 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.23-compact.zip
index e028b6f83..e70fd8853 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.23-legacy.zip
index 0e6dfd83e..97ab3ef72 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.24-compact.zip
index 8b592df1e..ddc5b0300 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.24-legacy.zip
index 06bfbf212..0cbfdf23e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.25-compact.zip
index 32c0b7a8f..a0b656a87 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.25-legacy.zip
index efe0c6f7c..db5461591 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.26-compact.zip
index d15e87fc3..6e2164171 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.26-legacy.zip
index 4b0c17014..a216f73be 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.3-legacy.zip
index b9109b87c..ee7e48746 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.4-legacy.zip
index a593eb773..293882576 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.5-legacy.zip
index 391e1223b..58605c061 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.6-legacy.zip
index d82f55f68..4e2027eb2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.7-legacy.zip
index a75b3951e..4fc8dadea 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.8-legacy.zip
index c98e40c5e..048224199 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.9-legacy.zip
index 965fcbada..232ef3969 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.0-compact.zip
index df61d307f..652853d07 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.0-legacy.zip
index 1f76c481d..71ef36ced 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.1-compact.zip
index faf6a0381..38f1f0d6e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.1-legacy.zip
index 184e6d99f..75bbc4b17 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.10-compact.zip
index 3a7de2d30..9c42a1d1f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.10-legacy.zip
index a20df67d3..7252fed25 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.11-compact.zip
index 09201a6dd..e987074dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.11-legacy.zip
index 71b3996be..0097fab63 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.12-compact.zip
index 9b9dea8d8..80bfc5039 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.12-legacy.zip
index 59d34cf88..9d9682860 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.13-compact.zip
index 2f551ab77..6d80f58f5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.13-legacy.zip
index 39dc10648..f03268348 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.14-compact.zip
index 56177f73f..cf2c9918e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.14-legacy.zip
index 2e2a5ec12..1866bc541 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.15-compact.zip
index 3f60a2211..38da2807d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.15-legacy.zip
index 22a3e197c..78092c2a5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.16-compact.zip
index 8e06c3ab4..36865a37f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.16-legacy.zip
index 63ec6918d..55d678e64 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.17-compact.zip
index c7520fc26..dfe2f2286 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.17-legacy.zip
index aa20d4685..b812ae7b6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.2-compact.zip
index 56efaa7dc..386b6b930 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.2-legacy.zip
index 407851f43..1e55aed7b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.3-compact.zip
index c572cc977..3ef238fe4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.3-legacy.zip
index 2c6820255..e1a9175e6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.4-compact.zip
index 50ac9754c..d8e2a14d4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.4-legacy.zip
index d6bb694f4..a3ccc38c1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.5-compact.zip
index 2dff4f64f..f700a1f09 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.5-legacy.zip
index f75c87128..393654f62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.6-compact.zip
index 94d88ee78..07dd0e629 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.6-legacy.zip
index 2194b64b0..a6d2d3895 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.7-compact.zip
index e9f46ef60..9440bf125 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.7-legacy.zip
index 10dbf0017..3a18f67e8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.8-compact.zip
index 74deedd6d..0823b786f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.8-legacy.zip
index 2bae05bd0..ce089f91c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.9-compact.zip
index 8a7178c11..325ff4bbe 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.9-legacy.zip
index 3ca17d8b0..e501811ca 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.0-compact.zip
index fbc5aa9cd..cce42d5a2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.0-legacy.zip
index d768caa73..142e6cc2b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.1-compact.zip
index c401b6183..4ad2c8094 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.1-legacy.zip
index 5a3686faa..414f7dc79 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.10-compact.zip
index 1b91d6bc2..c4ae20cb2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.10-legacy.zip
index 907a2be5d..29068873b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.11-compact.zip
index bcd9c8f06..a9b07d6d3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.11-legacy.zip
index d405ab2c2..30fb6677b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.12-compact.zip
index 2cca9bab7..8be9272d7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.12-legacy.zip
index eff86f6f8..813adfc68 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.2-compact.zip
index df824a4ee..fbe9ba166 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.2-legacy.zip
index f532485d2..7085e3f20 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.3-compact.zip
index 302121d3d..788ac7980 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.3-legacy.zip
index 0928c70dd..ff05fcb50 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.4-compact.zip
index 4d732710e..3763c8aa0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.4-legacy.zip
index 13ffc3b78..208059ec4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.5-compact.zip
index 6e5e5594a..041d57879 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.5-legacy.zip
index 6a3efb702..aaa4f9df1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.6-compact.zip
index d16a9482d..940765443 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.6-legacy.zip
index 3ab4a2a1f..70a423dbf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.7-compact.zip
index 5e790a2c5..a54ae8854 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.7-legacy.zip
index 1e152a020..a83769535 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.8-compact.zip
index d817951f7..a1d72e2ba 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.8-legacy.zip
index 2dac920ac..880c73a92 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.9-compact.zip
index 873f195dd..987d1e667 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.9-legacy.zip
index db7755004..0b210f53f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.0-compact.zip
index 71fde446b..b5a50e2b9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.0-legacy.zip
index afa8d67ac..827162a35 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.1-compact.zip
index e0c316fa0..84e7ae4ef 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.1-legacy.zip
index 035dc0a5b..7404d319b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.2-compact.zip
index 6a46b84ac..f581c7e2c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.2-legacy.zip
index 15d07f06c..982d4b926 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.3-compact.zip
index 5096d623d..0254fe422 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.3-legacy.zip
index 0bf6c7ce1..41133daa8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.4-compact.zip
index 52d0381ec..d6c343f75 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.4-legacy.zip
index da3efc72b..18a5add3d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.5-compact.zip
index 4551700d8..2fdea6a06 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.5-legacy.zip
index 7e4036a93..4f92a9b2c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.6-compact.zip
index 681bca8c3..1d0ea9de2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.6-legacy.zip
index e100d79e0..65f8f6390 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.0-compact.zip
index c42d3fbdd..ee5a8aa11 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.1-compact.zip
index 7adc82476..114c465a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.10-compact.zip
index ffe5e0fe2..11b8036a7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.11-compact.zip
index 50967fd7a..00fe6f4dd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.12-compact.zip
index ae394c307..cb382f24d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.13-compact.zip
index 7e2899ab1..08de3c41a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.14-compact.zip
index 6c038e5bf..c93ddd54a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.15-compact.zip
index f086f8bc8..9e54e5d75 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.2-compact.zip
index 8e296e6cd..1c3bd5368 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.3-compact.zip
index 7c0a2e906..33b015495 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.4-compact.zip
index 7ac5a9199..090908590 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.5-compact.zip
index abdc4dab8..9f06b5c64 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.6-compact.zip
index 2d021077c..9bcbc5570 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.7-compact.zip
index 61d5c0dff..036272e94 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.8-compact.zip
index f26bca5b5..a2c7caf6f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.9-compact.zip
index d9a3cb10a..21a5eb88e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/while-all.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.0.sol-0.4.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.0.sol-0.4.0-legacy.zip
index 23474da5b..51214a290 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.0.sol-0.4.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.0.sol-0.4.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.1-legacy.zip
index 34fca1c11..686b2e5b7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.10-legacy.zip
index ad2387151..e9cdb9221 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.2-legacy.zip
index 4f0947bc2..f631c940f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.3-legacy.zip
index f6492d172..5b1d187d0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.4-legacy.zip
index dcc9eeee3..8b78f9aae 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.5-legacy.zip
index 636157fb5..9b201087d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.6-legacy.zip
index 383889706..e3a347be3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.7-legacy.zip
index 26697eeb1..b77bcf859 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.8-legacy.zip
index 15ec35fd8..bccb7f80d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.9-legacy.zip
index 0e307907e..3a9729147 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.1.sol-0.4.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.11-legacy.zip
index 64d353234..1b2933c13 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.12-compact.zip
index c2da7eb46..78beb077e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.12-legacy.zip
index 17612f48b..f7d0eab09 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.13-compact.zip
index 837f42541..ca6911ea5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.13-legacy.zip
index e4560f29f..bf5f0b539 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.14-compact.zip
index 10c96daed..425a19641 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.14-legacy.zip
index 02c757991..4cab88924 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.15-compact.zip
index a30a1b301..3b604a345 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.15-legacy.zip
index 9f9569e74..69fb1b238 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.16-compact.zip
index f718f4e9f..7c0356f72 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.16-legacy.zip
index ca2836197..6a1a33510 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.17-compact.zip
index 22f666f6e..f4a975cec 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.17-legacy.zip
index f19d7cf64..660014f51 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.18-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.18-compact.zip
index f7e360fb4..570b85246 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.18-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.18-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.18-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.18-legacy.zip
index 00489e733..24e3ffbdc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.18-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.18-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.19-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.19-compact.zip
index ae7f22ecc..733432589 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.19-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.19-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.19-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.19-legacy.zip
index 901f89190..903fbece4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.19-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.19-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.20-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.20-compact.zip
index b9803292f..dcb9fb19c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.20-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.20-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.20-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.20-legacy.zip
index 433dfd22a..649e86e85 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.20-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.20-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.21-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.21-compact.zip
index 3ab58555a..7c09d27af 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.21-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.21-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.21-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.21-legacy.zip
index 2c49c79f8..6aa78367c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.21-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.21-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.22-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.22-compact.zip
index d8c21278c..c9dee05fc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.22-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.22-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.22-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.22-legacy.zip
index f3922006f..b457ebaeb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.22-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.22-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.23-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.23-compact.zip
index de3b0635d..5c25fbe32 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.23-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.23-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.23-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.23-legacy.zip
index a9eee6db6..691e8a685 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.23-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.23-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.24-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.24-compact.zip
index 32338eb9f..6c023d927 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.24-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.24-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.24-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.24-legacy.zip
index b82e0fadd..9d372cb8d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.24-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.24-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.25-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.25-compact.zip
index cffef8a9b..0d819af68 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.25-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.25-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.25-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.25-legacy.zip
index 84555ac07..e5f1ee026 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.25-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.25-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.26-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.26-compact.zip
index b8b710854..473fbe0bc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.26-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.26-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.26-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.26-legacy.zip
index a5cd568b2..719922fd3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.26-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.4.26-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.0-compact.zip
index efcff3467..6fe6ecb03 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.0-legacy.zip
index e0382bbf5..406a87533 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.1-compact.zip
index 300ee76cc..89d28e50b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.1-legacy.zip
index 8437ea3ca..194e6cf2f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.10-compact.zip
index 17614177f..bcfdd4319 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.10-legacy.zip
index b849d5849..b2a2dd5d8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.11-compact.zip
index 3ac43775c..aec5dd280 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.11-legacy.zip
index fa2f31037..ca0cb8e18 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.12-compact.zip
index 132168af9..2b15a4ff0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.12-legacy.zip
index 86df86d49..752fc67e9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.13-compact.zip
index c5cc2c4a5..6f2630c17 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.13-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.13-legacy.zip
index ad54392d7..b1d62a045 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.13-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.13-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.14-compact.zip
index fab8bc7db..043cd20bc 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.14-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.14-legacy.zip
index 6d4768e12..8b35ebdb7 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.14-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.14-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.15-compact.zip
index 49d9400ce..7748b1f45 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.15-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.15-legacy.zip
index 891215ccf..1c88bcfd1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.15-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.15-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.16-compact.zip
index b3d8d7b06..d335cd9db 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.16-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.16-legacy.zip
index 49ef4c7d9..3850cee77 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.16-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.16-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.17-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.17-compact.zip
index ced69f58a..b26dca6f4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.17-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.17-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.17-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.17-legacy.zip
index cda5be9bf..9ffdcb333 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.17-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.17-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.2-compact.zip
index 344aea40a..5e331cbf1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.2-legacy.zip
index 1e0b97bc8..6c9768bab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.3-compact.zip
index 7f4d2e09d..e78f2c55c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.3-legacy.zip
index 806e27889..992dc5771 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.4-compact.zip
index b58e6758f..aae67da9e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.4-legacy.zip
index 3458f1f6d..ea30c751b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.5-compact.zip
index 93881d609..2d5b068e1 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.5-legacy.zip
index c226dbce0..9eae9a175 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.6-compact.zip
index 891b8270a..deb48ecf0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.6-legacy.zip
index 144888a2c..9f408a78f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.7-compact.zip
index d8b653e5c..e088d33e4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.7-legacy.zip
index bb667b6bd..0a24d02cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.8-compact.zip
index ab7609c6e..9c8f34038 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.8-legacy.zip
index 300f34cf4..b68008617 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.9-compact.zip
index ee4be037a..617a04fd3 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.9-legacy.zip
index c6d1a986b..ed57bba62 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.5.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.0-compact.zip
index 821166ebc..a844a8dad 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.0-legacy.zip
index 79c8a6624..f9af5f1bd 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.1-compact.zip
index e40ef5727..58c97fa25 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.1-legacy.zip
index 40f263d88..4def4c2c8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.10-compact.zip
index 8a94b49a1..3d4b69d3c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.10-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.10-legacy.zip
index 869e5efa4..f6756c811 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.10-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.10-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.11-compact.zip
index 4576ba13b..684834770 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.11-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.11-legacy.zip
index 08d8ad36c..2710e4074 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.11-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.11-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.12-compact.zip
index d9ac54a6f..3027bbab9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.12-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.12-legacy.zip
index ce7a0b26b..5b191d560 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.12-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.12-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.2-compact.zip
index d358a35d5..cbbd2bbfa 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.2-legacy.zip
index 5a13b4c6e..786e50033 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.3-compact.zip
index e8a9866e5..5c8c21a9c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.3-legacy.zip
index 9d1fd3c1e..e91362497 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.4-compact.zip
index 8769b251c..a30c81525 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.4-legacy.zip
index 112cea9f2..81b883df8 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.5-compact.zip
index 52652805d..433a5e6c5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.5-legacy.zip
index aa9663c81..56b1ae50e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.6-compact.zip
index e61ca6fdb..ccc4b0433 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.6-legacy.zip
index 9edc29301..0867ef01c 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.7-compact.zip
index c36c69cf8..f32325e22 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.7-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.7-legacy.zip
index a5cbeb6b0..57019b61d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.7-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.7-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.8-compact.zip
index d289df7e7..6173d781d 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.8-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.8-legacy.zip
index 32c105e54..99e1c83ab 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.8-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.8-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.9-compact.zip
index 435a51a12..53e5dc0ee 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.9-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.9-legacy.zip
index 9d5f30e0d..7f097ebb5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.9-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.4.11.sol-0.6.9-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.0-compact.zip
index ce585c973..5412f9963 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.0-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.0-legacy.zip
index 3ba1b3a38..858d44173 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.0-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.0-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.1-compact.zip
index ea08fb41b..3c303738e 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.1-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.1-legacy.zip
index 7e0834a69..01d65c9cb 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.1-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.1-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.2-compact.zip
index 8b46066f0..c12777f70 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.2-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.2-legacy.zip
index e4077cc39..03b3ff984 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.2-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.2-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.3-compact.zip
index b3bfc5fc2..b47251a4a 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.3-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.3-legacy.zip
index c2a751c6f..00527bbf4 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.3-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.3-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.4-compact.zip
index 84b3d8c79..459ec9c2f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.4-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.4-legacy.zip
index e3f3f9a22..fb0c82216 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.4-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.0.sol-0.7.4-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.5-compact.zip
index 06992006b..5c23f6b83 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.5-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.5-legacy.zip
index ce8d10e58..5ca6e8966 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.5-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.5-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.6-compact.zip
index 9b89b40e1..66ab9b710 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.6-legacy.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.6-legacy.zip
index 1ec6ea928..ef2e47da6 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.6-legacy.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.7.5.sol-0.7.6-legacy.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.0-compact.zip
index 978d4f369..0ba24b38b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.0-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.1-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.1-compact.zip
index 4bec78ff9..6403ce7da 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.1-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.1-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.10-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.10-compact.zip
index 3bb97a318..101411c61 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.10-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.10-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.11-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.11-compact.zip
index 1911cca4e..e891e73b0 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.11-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.11-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.12-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.12-compact.zip
index 0496870e9..a3ebb3137 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.12-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.12-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.13-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.13-compact.zip
index 7fa50da53..a22ae5dd9 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.13-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.13-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.14-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.14-compact.zip
index 10447105b..1a9f562f2 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.14-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.14-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.15-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.15-compact.zip
index e7cdd8058..4eee4c374 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.15-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.15-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.2-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.2-compact.zip
index a82c5d9a5..7bc5119ed 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.2-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.2-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.3-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.3-compact.zip
index d4e6e2186..26d001a0b 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.3-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.3-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.4-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.4-compact.zip
index a7821473d..6d5968fcf 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.4-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.4-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.5-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.5-compact.zip
index d04e5bc71..0df87f414 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.5-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.5-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.6-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.6-compact.zip
index edf1a477a..921607219 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.6-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.6-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.7-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.7-compact.zip
index 564233c3f..59482d885 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.7-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.7-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.8-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.8-compact.zip
index d972371ee..e284e6dc5 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.8-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.8-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.9-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.9-compact.zip
index f098c52a0..e939ac4ce 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.9-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-0.8.0.sol-0.8.9-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-state-constant-access.sol-0.8.16-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-state-constant-access.sol-0.8.16-compact.zip
index 121d6c5ec..73de4c4df 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-state-constant-access.sol-0.8.16-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-state-constant-access.sol-0.8.16-compact.zip differ
diff --git a/tests/e2e/solc_parsing/test_data/compile/yul-top-level-0.8.0.sol-0.8.0-compact.zip b/tests/e2e/solc_parsing/test_data/compile/yul-top-level-0.8.0.sol-0.8.0-compact.zip
index ce81a5c37..3a89ec34f 100644
Binary files a/tests/e2e/solc_parsing/test_data/compile/yul-top-level-0.8.0.sol-0.8.0-compact.zip and b/tests/e2e/solc_parsing/test_data/compile/yul-top-level-0.8.0.sol-0.8.0-compact.zip differ