diff --git a/test/bytecode_2.4_run/05_long_literals24.pyc b/test/bytecode_2.4_run/05_long_literals24.pyc
new file mode 100644
index 00000000..383aa905
Binary files /dev/null and b/test/bytecode_2.4_run/05_long_literals24.pyc differ
diff --git a/test/simple_source/expression/05_long_literals24.py b/test/simple_source/expression/05_long_literals24.py
new file mode 100644
index 00000000..f62ba222
--- /dev/null
+++ b/test/simple_source/expression/05_long_literals24.py
@@ -0,0 +1,721 @@
+# Long lists pose a slowdown in uncompiling.
+"This program is self-checking!"
+
+# Try an empty list to check that long-matching detection doesn't mess that up.
+# In theory this should work even though we put cap on short lists which
+# is checked below.
+x = []
+assert len(x) == 0 and isinstance(x, list)
+
+# Try an short list to check that long-matching detection doesn't mess that up.
+# This is a more general situation of the above.
+x = [1, 1, 1]
+
+# Until we have better "and" rules (which we have
+# around, but not in decompyle3 or uncompyle6 yet)
+# avoid 3-term "and"s
+assert len(x) == 3
+assert isinstance(x, list) and all(x)
+
+# fmt: off
+# Try a long list. This should not be slow
+# as it has been in the past.
+x = [
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+]
+
+assert all(x)
+assert len(x) == 300 and isinstance(x, list)
+
+# Python before 2.7 doesn't have sets literal
+# # Try a long set. This should not be slow
+# # as it has been in the past.
+# x = {
+#     1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+#     1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+#     1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+#     1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+#     1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+#     1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+#     1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+#     1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+#     1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+# }
+
+# assert x == {1} and isinstance(x, set)
+
+# Try using variables rather than constants
+a = 1
+# First, a list
+x = [
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+    a, a, a, a, a, a, a, a, a, a,
+]
+
+assert all(x)
+assert len(x) == 300 and isinstance(x, list)
+
+# Next, a set
+
+# x = {
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+#     a, a, a, a, a, a, a, a, a, a,
+# }
+
+# assert x == {1} and isinstance(x, set)
+
+# Check some dictionary keys.
+# Ensure that in dictionary we produce quoted strings
+x = {
+    "b": 1,
+    "c": 2,
+    "e": 3,
+    "g": 6,
+    "h": 7,
+    "j": 9,
+    "k": 11,
+    "return": 12,
+}
+
+assert sorted(x.keys()) == ["b", "c", "e", "g", "h", "j", "k", "return"]
+
+# Ensure that in dictionary we produce integers, not strings
+x = {1: 2, 3: 4}
+
+assert tuple(x.keys()) == (1, 3)
+
+# Try a long dictionary.
+# This should not be slow as it has been in the past
+values = {
+    "value1": x,  # Note this is LOAD_NAME
+    "value2": 2 + 1,  # Constant should be folded into "LOAD_CONST"
+    "value3": 3 + 1,
+    "value4": 4 + 1,
+    "value5": 5 + 1,
+    "value6": 6 + 1,
+    "value7": 7 + 1,
+    "value8": 8 + 1,
+    "value9": 9 + 1,
+    "value10": 10 + 1,
+    "value11": 11 + 1,
+    "value12": 12 + 1,
+    "value13": 13 + 1,
+    "value14": 14 + 1,
+    "value15": 15 + 1,
+    "value16": 16 + 1,
+    "value17": 17 + 1,
+    "value18": 18 + 1,
+    "value19": 19 + 1,
+    "value20": 20 + 1,
+    "value21": 21 + 1,
+    "value22": 22 + 1,
+    "value23": 23 + 1,
+    "value24": 24 + 1,
+    "value25": 25 + 1,
+    "value26": 26 + 1,
+    "value27": 27 + 1,
+    "value28": 28 + 1,
+    "value29": 29 + 1,
+    "value30": 30 + 1,
+    "value31": 31 + 1,
+    "value32": 32 + 1,
+    "value33": 33 + 1,
+    "value34": 34 + 1,
+    "value35": 35 + 1,
+    "value36": 36 + 1,
+    "value37": 37 + 1,
+    "value38": 38 + 1,
+    "value39": 39 + 1,
+    "value40": 40 + 1,
+    "value41": 41 + 1,
+    "value42": 42 + 1,
+    "value43": 43 + 1,
+    "value44": 44 + 1,
+    "value45": 45 + 1,
+    "value46": 46 + 1,
+    "value47": 47 + 1,
+    "value48": 48 + 1,
+    "value49": 49 + 1,
+    "value50": 50 + 1,
+    "value51": 51 + 1,
+    "value52": 52 + 1,
+    "value53": 53 + 1,
+    "value54": 54 + 1,
+    "value55": 55 + 1,
+    "value56": 56 + 1,
+    "value57": 57 + 1,
+    "value58": 58 + 1,
+    "value59": 59 + 1,
+    "value60": 60 + 1,
+    "value61": 61 + 1,
+    "value62": 62 + 1,
+    "value63": 63 + 1,
+    "value64": 64 + 1,
+    "value65": 65 + 1,
+    "value66": 66 + 1,
+    "value67": 67 + 1,
+    "value68": 68 + 1,
+    "value69": 69 + 1,
+    "value70": 70 + 1,
+    "value71": 71 + 1,
+    "value72": 72 + 1,
+    "value73": 73 + 1,
+    "value74": 74 + 1,
+    "value75": 75 + 1,
+    "value76": 76 + 1,
+    "value77": 77 + 1,
+    "value78": 78 + 1,
+    "value79": 79 + 1,
+    "value80": 80 + 1,
+    "value81": 81 + 1,
+    "value82": 82 + 1,
+    "value83": 83 + 1,
+    "value84": 84 + 1,
+    "value85": 85 + 1,
+    "value86": 86 + 1,
+    "value87": 87 + 1,
+    "value88": 88 + 1,
+    "value89": 89 + 1,
+    "value90": 90 + 1,
+    "value91": 91 + 1,
+    "value92": 92 + 1,
+    "value93": 93 + 1,
+    "value94": 94 + 1,
+    "value95": 95 + 1,
+    "value96": 96 + 1,
+    "value97": 97 + 1,
+    "value98": 98 + 1,
+    "value99": 99 + 1,
+    "value100": 100 + 1,
+    "value101": 101 + 1,
+    "value102": 102 + 1,
+    "value103": 103 + 1,
+    "value104": 104 + 1,
+    "value105": 105 + 1,
+    "value106": 106 + 1,
+    "value107": 107 + 1,
+    "value108": 108 + 1,
+    "value109": 109 + 1,
+    "value110": 110 + 1,
+    "value111": 111 + 1,
+    "value112": 112 + 1,
+    "value113": 113 + 1,
+    "value114": 114 + 1,
+    "value115": 115 + 1,
+    "value116": 116 + 1,
+    "value117": 117 + 1,
+    "value118": 118 + 1,
+    "value119": 119 + 1,
+    "value120": 120 + 1,
+    "value121": 121 + 1,
+    "value122": 122 + 1,
+    "value123": 123 + 1,
+    "value124": 124 + 1,
+    "value125": 125 + 1,
+    "value126": 126 + 1,
+    "value127": 127 + 1,
+    "value128": 128 + 1,
+    "value129": 129 + 1,
+    "value130": 130 + 1,
+    "value131": 131 + 1,
+    "value132": 132 + 1,
+    "value133": 133 + 1,
+    "value134": 134 + 1,
+    "value135": 135 + 1,
+    "value136": 136 + 1,
+    "value137": 137 + 1,
+    "value138": 138 + 1,
+    "value139": 139 + 1,
+    "value140": 140 + 1,
+    "value141": 141 + 1,
+    "value142": 142 + 1,
+    "value143": 143 + 1,
+    "value144": 144 + 1,
+    "value145": 145 + 1,
+    "value146": 146 + 1,
+    "value147": 147 + 1,
+    "value148": 148 + 1,
+    "value149": 149 + 1,
+    "value150": 150 + 1,
+    "value151": 151 + 1,
+    "value152": 152 + 1,
+    "value153": 153 + 1,
+    "value154": 154 + 1,
+    "value155": 155 + 1,
+    "value156": 156 + 1,
+    "value157": 157 + 1,
+    "value158": 158 + 1,
+    "value159": 159 + 1,
+    "value160": 160 + 1,
+    "value161": 161 + 1,
+    "value162": 162 + 1,
+    "value163": 163 + 1,
+    "value164": 164 + 1,
+    "value165": 165 + 1,
+    "value166": 166 + 1,
+    "value167": 167 + 1,
+    "value168": 168 + 1,
+    "value169": 169 + 1,
+    "value170": 170 + 1,
+    "value171": 171 + 1,
+    "value172": 172 + 1,
+    "value173": 173 + 1,
+    "value174": 174 + 1,
+    "value175": 175 + 1,
+    "value176": 176 + 1,
+    "value177": 177 + 1,
+    "value178": 178 + 1,
+    "value179": 179 + 1,
+    "value180": 180 + 1,
+    "value181": 181 + 1,
+    "value182": 182 + 1,
+    "value183": 183 + 1,
+    "value184": 184 + 1,
+    "value185": 185 + 1,
+    "value186": 186 + 1,
+    "value187": 187 + 1,
+    "value188": 188 + 1,
+    "value189": 189 + 1,
+    "value190": 190 + 1,
+    "value191": 191 + 1,
+    "value192": 192 + 1,
+    "value193": 193 + 1,
+    "value194": 194 + 1,
+    "value195": 195 + 1,
+    "value196": 196 + 1,
+    "value197": 197 + 1,
+    "value198": 198 + 1,
+    "value199": 199 + 1,
+    "value200": 200 + 1,
+    "value201": 201 + 1,
+    "value202": 202 + 1,
+    "value203": 203 + 1,
+    "value204": 204 + 1,
+    "value205": 205 + 1,
+    "value206": 206 + 1,
+    "value207": 207 + 1,
+    "value208": 208 + 1,
+    "value209": 209 + 1,
+    "value210": 210 + 1,
+    "value211": 211 + 1,
+    "value212": 212 + 1,
+    "value213": 213 + 1,
+    "value214": 214 + 1,
+    "value215": 215 + 1,
+    "value216": 216 + 1,
+    "value217": 217 + 1,
+    "value218": 218 + 1,
+    "value219": 219 + 1,
+    "value220": 220 + 1,
+    "value221": 221 + 1,
+    "value222": 222 + 1,
+    "value223": 223 + 1,
+    "value224": 224 + 1,
+    "value225": 225 + 1,
+    "value226": 226 + 1,
+    "value227": 227 + 1,
+    "value228": 228 + 1,
+    "value229": 229 + 1,
+    "value230": 230 + 1,
+    "value231": 231 + 1,
+    "value232": 232 + 1,
+    "value233": 233 + 1,
+    "value234": 234 + 1,
+    "value235": 235 + 1,
+    "value236": 236 + 1,
+    "value237": 237 + 1,
+    "value238": 238 + 1,
+    "value239": 239 + 1,
+    "value240": 240 + 1,
+    "value241": 241 + 1,
+    "value242": 242 + 1,
+    "value243": 243 + 1,
+    "value244": 244 + 1,
+    "value245": 245 + 1,
+    "value246": 246 + 1,
+    "value247": 247 + 1,
+    "value248": 248 + 1,
+    "value249": 249 + 1,
+    "value250": 250 + 1,
+    "value251": 251 + 1,
+    "value252": 252 + 1,
+    "value253": 253 + 1,
+    "value254": 254 + 1,
+    "value255": 255 + 1,
+    "value256": 256 + 1,
+    "value257": 257 + 1,
+    "value258": 258 + 1,
+    "value259": 259 + 1,
+    "value260": 260 + 1,
+    "value261": 261 + 1,
+    "value262": 262 + 1,
+    "value263": 263 + 1,
+    "value264": 264 + 1,
+    "value265": 265 + 1,
+    "value266": 266 + 1,
+    "value267": 267 + 1,
+    "value268": 268 + 1,
+    "value269": 269 + 1,
+    "value270": 270 + 1,
+    "value271": 271 + 1,
+    "value272": 272 + 1,
+    "value273": 273 + 1,
+    "value274": 274 + 1,
+    "value275": 275 + 1,
+    "value276": 276 + 1,
+    "value277": 277 + 1,
+    "value278": 278 + 1,
+    "value279": 279 + 1,
+    "value280": 280 + 1,
+    "value281": 281 + 1,
+    "value282": 282 + 1,
+    "value283": 283 + 1,
+    "value284": 284 + 1,
+    "value285": 285 + 1,
+    "value286": 286 + 1,
+    "value287": 287 + 1,
+    "value288": 288 + 1,
+    "value289": 289 + 1,
+    "value290": 290 + 1,
+    "value291": 291 + 1,
+    "value292": 292 + 1,
+    "value293": 293 + 1,
+    "value294": 294 + 1,
+    "value295": 295 + 1,
+    "value296": 296 + 1,
+    "value297": 297 + 1,
+    "value298": 298 + 1,
+    "value299": 299 + 1,
+    "value300": 300 + 1,
+    "value301": 301 + 1,
+    "value302": 302 + 1,
+    "value303": 303 + 1,
+    "value304": 304 + 1,
+    "value305": 305 + 1,
+    "value306": 306 + 1,
+    "value307": 307 + 1,
+    "value308": 308 + 1,
+    "value309": 309 + 1,
+    "value310": 310 + 1,
+    "value311": 311 + 1,
+    "value312": 312 + 1,
+    "value313": 313 + 1,
+    "value314": 314 + 1,
+    "value315": 315 + 1,
+    "value316": 316 + 1,
+    "value317": 317 + 1,
+    "value318": 318 + 1,
+    "value319": 319 + 1,
+    "value320": 320 + 1,
+    "value321": 321 + 1,
+    "value322": 322 + 1,
+    "value323": 323 + 1,
+    "value324": 324 + 1,
+    "value325": 325 + 1,
+    "value326": 326 + 1,
+    "value327": 327 + 1,
+    "value328": 328 + 1,
+    "value329": 329 + 1,
+    "value330": 330 + 1,
+    "value331": 331 + 1,
+    "value332": 332 + 1,
+    "value333": 333 + 1,
+    "value334": 334 + 1,
+    "value335": 335 + 1,
+    "value336": 336 + 1,
+    "value337": 337 + 1,
+    "value338": 338 + 1,
+    "value339": 339 + 1,
+    "value340": 340 + 1,
+    "value341": 341 + 1,
+    "value342": 342 + 1,
+    "value343": 343 + 1,
+    "value344": 344 + 1,
+    "value345": 345 + 1,
+    "value346": 346 + 1,
+    "value347": 347 + 1,
+    "value348": 348 + 1,
+    "value349": 349 + 1,
+    "value350": 350 + 1,
+    "value351": 351 + 1,
+    "value352": 352 + 1,
+    "value353": 353 + 1,
+    "value354": 354 + 1,
+    "value355": 355 + 1,
+    "value356": 356 + 1,
+    "value357": 357 + 1,
+    "value358": 358 + 1,
+    "value359": 359 + 1,
+    "value360": 360 + 1,
+    "value361": 361 + 1,
+    "value362": 362 + 1,
+    "value363": 363 + 1,
+    "value364": 364 + 1,
+    "value365": 365 + 1,
+    "value366": 366 + 1,
+    "value367": 367 + 1,
+    "value368": 368 + 1,
+    "value369": 369 + 1,
+    "value370": 370 + 1,
+    "value371": 371 + 1,
+    "value372": 372 + 1,
+    "value373": 373 + 1,
+    "value374": 374 + 1,
+    "value375": 375 + 1,
+    "value376": 376 + 1,
+    "value377": 377 + 1,
+    "value378": 378 + 1,
+    "value379": 379 + 1,
+    "value380": 380 + 1,
+    "value381": 381 + 1,
+    "value382": 382 + 1,
+    "value383": 383 + 1,
+    "value384": 384 + 1,
+    "value385": 385 + 1,
+    "value386": 386 + 1,
+    "value387": 387 + 1,
+    "value388": 388 + 1,
+    "value389": 389 + 1,
+    "value390": 390 + 1,
+    "value391": 391 + 1,
+    "value392": 392 + 1,
+    "value393": 393 + 1,
+    "value394": 394 + 1,
+    "value395": 395 + 1,
+    "value396": 396 + 1,
+    "value397": 397 + 1,
+    "value398": 398 + 1,
+    "value399": 399 + 1,
+    "value400": 400 + 1,
+    "value401": 401 + 1,
+    "value402": 402 + 1,
+    "value403": 403 + 1,
+    "value404": 404 + 1,
+    "value405": 405 + 1,
+    "value406": 406 + 1,
+    "value407": 407 + 1,
+    "value408": 408 + 1,
+    "value409": 409 + 1,
+    "value410": 410 + 1,
+    "value411": 411 + 1,
+    "value412": 412 + 1,
+    "value413": 413 + 1,
+    "value414": 414 + 1,
+    "value415": 415 + 1,
+    "value416": 416 + 1,
+    "value417": 417 + 1,
+    "value418": 418 + 1,
+    "value419": 419 + 1,
+    "value420": 420 + 1,
+    "value421": 421 + 1,
+    "value422": 422 + 1,
+    "value423": 423 + 1,
+    "value424": 424 + 1,
+    "value425": 425 + 1,
+    "value426": 426 + 1,
+    "value427": 427 + 1,
+    "value428": 428 + 1,
+    "value429": 429 + 1,
+    "value430": 430 + 1,
+    "value431": 431 + 1,
+    "value432": 432 + 1,
+    "value433": 433 + 1,
+    "value434": 434 + 1,
+    "value435": 435 + 1,
+    "value436": 436 + 1,
+    "value437": 437 + 1,
+    "value438": 438 + 1,
+    "value439": 439 + 1,
+    "value440": 440 + 1,
+    "value441": 441 + 1,
+    "value442": 442 + 1,
+    "value443": 443 + 1,
+    "value444": 444 + 1,
+    "value445": 445 + 1,
+    "value446": 446 + 1,
+    "value447": 447 + 1,
+    "value448": 448 + 1,
+    "value449": 449 + 1,
+    "value450": 450 + 1,
+    "value451": 451 + 1,
+    "value452": 452 + 1,
+    "value453": 453 + 1,
+    "value454": 454 + 1,
+    "value455": 455 + 1,
+    "value456": 456 + 1,
+    "value457": 457 + 1,
+    "value458": 458 + 1,
+    "value459": 459 + 1,
+    "value460": 460 + 1,
+    "value461": 461 + 1,
+    "value462": 462 + 1,
+    "value463": 463 + 1,
+    "value464": 464 + 1,
+    "value465": 465 + 1,
+    "value466": 466 + 1,
+    "value467": 467 + 1,
+    "value468": 468 + 1,
+    "value469": 469 + 1,
+    "value470": 470 + 1,
+    "value471": 471 + 1,
+    "value472": 472 + 1,
+    "value473": 473 + 1,
+    "value474": 474 + 1,
+    "value475": 475 + 1,
+    "value476": 476 + 1,
+    "value477": 477 + 1,
+    "value478": 478 + 1,
+    "value479": 479 + 1,
+    "value480": 480 + 1,
+    "value481": 481 + 1,
+    "value482": 482 + 1,
+    "value483": 483 + 1,
+    "value484": 484 + 1,
+    "value485": 485 + 1,
+    "value486": 486 + 1,
+    "value487": 487 + 1,
+    "value488": 488 + 1,
+    "value489": 489 + 1,
+    "value490": 490 + 1,
+    "value491": 491 + 1,
+    "value492": 492 + 1,
+    "value493": 493 + 1,
+    "value494": 494 + 1,
+    "value495": 495 + 1,
+    "value496": 496 + 1,
+    "value497": 497 + 1,
+    "value498": 498 + 1,
+    "value499": 499 + 1,
+    "value500": 500 + 1,
+    "value501": 501 + 1,
+    "value502": 502 + 1,
+}
+
+assert len(values.values()) == 502
+
+# Try a long dictionary that fails because we have a binary op.
+# We can get a expr32 grouping speedup
+# which is slower than if this were all constant.
+# The above was not implemented at the time this test was written.
+values = {
+    "value1": a + 1,  # This is a binary op not consant
+    "value2": 2,
+    "value3": 3,
+    "value4": 4,
+    "value5": 5,
+    "value6": 6,
+    "value7": 7,
+    "value8": 8,
+    "value9": 9,
+    "value10": 10,
+    "value11": 11,
+    "value12": 12,
+    "value13": 13,
+    "value14": 14,
+    "value15": 15,
+    "value16": 16,
+    "value17": 17,
+    "value18": 18,
+    "value19": 19,
+    "value20": 20,
+    "value21": 21,
+    "value22": 22,
+    "value23": 23,
+    "value24": 24,
+    "value25": 25,
+    "value26": 26,
+    "value27": 27,
+    "value28": 28,
+    "value29": 29,
+    "value30": 30,
+    "value31": 31,
+    "value32": 32,
+    "value33": 33,
+}
+
+assert len(values.values()) == 33