diff --git a/uncompyle6/bin/uncompile.py b/uncompyle6/bin/uncompile.py
index 6104d13c..e0f30d3a 100755
--- a/uncompyle6/bin/uncompile.py
+++ b/uncompyle6/bin/uncompile.py
@@ -68,11 +68,9 @@ def usage():
 
 
 def main_bin():
-    if not (sys.version_info[0:2] in ((2, 4), (2, 5), (2, 6), (2, 7),
-                                      (3, 2), (3, 3),
-                                      (3, 4), (3, 5), (3, 6), (3, 7))):
-        sys.stderr.write('Error: %s requires Python 2.4 2.5 2.6, 2.7, '
-                         '3.2, 3.3, 3.4, 3.5, or 3.6' % program)
+    if not (sys.version_info[0:2] in ((2, 4), (2, 5), (2, 6), (2, 7)):
+        sys.stderr.write('Error: this branch of %s requires Python 2.4, 2.5, 2.6 or 2.7'
+                         % program)
         sys.exit(-1)
 
     do_verify = recurse_dirs = False
diff --git a/uncompyle6/semantics/make_function.py b/uncompyle6/semantics/make_function.py
index 3f9d3a1c..8ad84981 100644
--- a/uncompyle6/semantics/make_function.py
+++ b/uncompyle6/semantics/make_function.py
@@ -595,8 +595,9 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
     paramnames = list(scanner_code.co_varnames[:argc])
 
     # defaults are for last n parameters, thus reverse
-    if not 3.0 == self.version or self.version >= 3.6:
-        paramnames.reverse(); defparams.reverse()
+    if self.version < 3.6:
+        paramnames.reverse();
+        defparams.reverse()
 
     try:
         ast = self.build_ast(scanner_code._tokens,
@@ -625,7 +626,7 @@ def make_function3(self, node, is_lambda, nested=1, code_node=None):
     else:
         params = paramnames
 
-    if not 3.0 == self.version or self.version >= 3.6:
+    if not 3.1 <= self.version < 3.6:
         params.reverse() # back to correct order
 
         if code_has_star_arg(code):