diff --git a/test/Makefile b/test/Makefile
index 97f66f6a..1e233a85 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -49,6 +49,10 @@ check-3.5: check-bytecode
 check-3.6: check-bytecode
 	$(PYTHON) test_pythonlib.py --bytecode-3.6 --weak-verify $(COMPILE)
 
+# FIXME
+#: this is called when running under pypy3.5-5.8.0
+5.8:
+
 #: Check deparsing only, but from a different Python version
 check-disasm:
 	$(PYTHON) dis-compare.py
diff --git a/uncompyle6/semantics/consts.py b/uncompyle6/semantics/consts.py
index 6041eddb..55343656 100644
--- a/uncompyle6/semantics/consts.py
+++ b/uncompyle6/semantics/consts.py
@@ -67,10 +67,10 @@ TABLE_R0 = {
 }
 
 TABLE_DIRECT = {
-    'BINARY_ADD':	    ( '+' ,),
-    'BINARY_SUBTRACT':	( '-' ,),
-    'BINARY_MULTIPLY':	( '*' ,),
-    'BINARY_DIVIDE':	( '/' ,),
+    'BINARY_ADD':	        ( '+' ,),
+    'BINARY_SUBTRACT':	        ( '-' ,),
+    'BINARY_MULTIPLY':	        ( '*' ,),
+    'BINARY_DIVIDE':	        ( '/' ,),
     'BINARY_MATRIX_MULTIPLY':	( '@' ,),
     'BINARY_TRUE_DIVIDE':	( '/' ,),   # Not in <= 2.1
     'BINARY_FLOOR_DIVIDE':	( '//' ,),
@@ -110,10 +110,13 @@ TABLE_DIRECT = {
                                   (0, 'expr' ) ),
     'unary_convert':            ( '`%c`',
                                   (0, 'expr' ), ),
-    'get_iter':	                ( 'iter(%c)', 0 ),
-    'slice0':		        ( '%c[:]', 0 ),
+    'get_iter':	                ( 'iter(%c)',
+                                  (0, 'expr'), ),
+    'slice0':		        ( '%c[:]',
+                                  (0, 'expr'), ),
     'slice1':		        ( '%c[%p:]',
-                                  0, (1, 100) ),
+                                  (0, 'expr'),
+                                  (1, 100) ),
     'slice2':		        ( '%c[:%p]',
                                   0, (1, 100) ),
     'slice3':		        ( '%c[%p:%p]',