diff --git a/pymbolic/parser.py b/pymbolic/parser.py
index 4a280e1974e54c2274ca15f980a15a6a41e8ddd8..cea1e2a7159ce5f54d5a8493c447d9f4f18e26dc 100644
--- a/pymbolic/parser.py
+++ b/pymbolic/parser.py
@@ -1,5 +1,4 @@
-from __future__ import division
-from __future__ import absolute_import
+from __future__ import division, absolute_import
 
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
@@ -24,6 +23,7 @@ THE SOFTWARE.
 """
 
 import pytools.lex
+from six.moves import intern
 
 _imaginary = intern("imaginary")
 _float = intern("float")
diff --git a/pymbolic/polynomial.py b/pymbolic/polynomial.py
index 48959ef906f38eb267fba8559517722dc99094ef..ad878fd05265f982db3d3e3658a202796671ff55 100644
--- a/pymbolic/polynomial.py
+++ b/pymbolic/polynomial.py
@@ -1,7 +1,7 @@
 from __future__ import division
 from __future__ import absolute_import
 from __future__ import print_function
-from six.moves import range
+from six.moves import range, intern
 
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
diff --git a/pymbolic/primitives.py b/pymbolic/primitives.py
index df9ffde194bd394dac9edeed2dee70815bd0aed6..f86eaf24c963db756588874be6d4c93caba2329f 100644
--- a/pymbolic/primitives.py
+++ b/pymbolic/primitives.py
@@ -1,5 +1,6 @@
 from __future__ import division
 from __future__ import absolute_import
+from six.moves import intern
 
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
diff --git a/pymbolic/rational.py b/pymbolic/rational.py
index 4ca699d11b771302111dcc67d0de31a9bad43987..7296881c9877b922778e600d38293012ea8b85de 100644
--- a/pymbolic/rational.py
+++ b/pymbolic/rational.py
@@ -1,6 +1,4 @@
-from __future__ import division
-from __future__ import absolute_import
-from __future__ import print_function
+from __future__ import division, absolute_import, print_function
 
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
@@ -24,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
 
+from six.moves import intern
 import pymbolic.primitives as primitives
 import pymbolic.traits as traits
 
diff --git a/setup.py b/setup.py
index 986e4e583b1e83ceee80669c48c6c2cee54fc4fc..ba7976c2f7b6c9687c23ed37e110fb856f19dcd2 100644
--- a/setup.py
+++ b/setup.py
@@ -3,12 +3,6 @@
 
 from setuptools import setup
 
-try:
-    from distutils.command.build_py import build_py_2to3 as build_py
-except ImportError:
-    # 2.x
-    from distutils.command.build_py import build_py
-
 ver_dic = {}
 version_file = open("pymbolic/version.py")
 try:
@@ -55,7 +49,4 @@ setup(name="pymbolic",
           "pytools>=2",
           "pytest>=2.3",
           "six",
-          ],
-
-      # 2to3 invocation
-      cmdclass={'build_py': build_py})
+          ])