diff --git a/examples/advection/surface.py b/examples/advection/surface.py
index 7010104798423db04b08ad12bded560302595d49..aaced3d532f65e876af0ee0853940f6baed0ff8d 100644
--- a/examples/advection/surface.py
+++ b/examples/advection/surface.py
@@ -31,8 +31,7 @@ import numpy as np
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from arraycontext.impl.pyopencl import PyOpenCLArrayContext
-from arraycontext.container.traversal import thaw
+from arraycontext import PyOpenCLArrayContext, thaw
 
 from meshmode.dof_array import flatten
 from meshmode.discretization.connection import FACE_RESTR_INTERIOR
@@ -270,7 +269,7 @@ if __name__ == "__main__":
 
     parser = argparse.ArgumentParser()
     parser.add_argument("--dim", choices=[2, 3], default=2, type=int)
-    parser.add_argument("--use_quad", choices=[True, False], default=False)
+    parser.add_argument("--use-quad", action="store_false")
     args = parser.parse_args()
 
     logging.basicConfig(level=logging.INFO)
diff --git a/examples/advection/var-velocity.py b/examples/advection/var-velocity.py
index f239d61bb2cd84ba0d6bc81a2b9c1e3d8c16a0be..90c7b6d8fc21df925d6e3b0c2ed0e9c76f260f29 100644
--- a/examples/advection/var-velocity.py
+++ b/examples/advection/var-velocity.py
@@ -31,8 +31,7 @@ import numpy as np
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from arraycontext.impl.pyopencl import PyOpenCLArrayContext
-from arraycontext.container.traversal import thaw
+from arraycontext import PyOpenCLArrayContext, thaw
 
 from meshmode.dof_array import flatten
 from meshmode.mesh import BTAG_ALL
@@ -233,7 +232,7 @@ if __name__ == "__main__":
 
     parser = argparse.ArgumentParser()
     parser.add_argument("--dim", default=2, type=int)
-    parser.add_argument("--use_quad", choices=[True, False], default=False)
+    parser.add_argument("--use-quad", action="store_false")
     args = parser.parse_args()
 
     logging.basicConfig(level=logging.INFO)
diff --git a/examples/advection/weak.py b/examples/advection/weak.py
index f59e2d8fa380ae6c864e5f2d6e373ce216e3ab09..88d26a565c08b90d8dedd90ffa35f9530889d292 100644
--- a/examples/advection/weak.py
+++ b/examples/advection/weak.py
@@ -32,8 +32,7 @@ import numpy.linalg as la
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from arraycontext.impl.pyopencl import PyOpenCLArrayContext
-from arraycontext.container.traversal import thaw
+from arraycontext import PyOpenCLArrayContext, thaw
 
 from meshmode.dof_array import flatten
 from meshmode.mesh import BTAG_ALL
diff --git a/examples/geometry.py b/examples/geometry.py
index 594a204c3ee4b322528310ef4acd64dedf35e808..faf0fc42c1553ea764dbc1621142e21c9f3f4599 100644
--- a/examples/geometry.py
+++ b/examples/geometry.py
@@ -30,8 +30,7 @@ import numpy as np  # noqa
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from arraycontext.impl.pyopencl import PyOpenCLArrayContext
-from arraycontext.container.traversal import thaw
+from arraycontext import PyOpenCLArrayContext, thaw
 
 import grudge.op as op
 
diff --git a/examples/maxwell/cavities.py b/examples/maxwell/cavities.py
index 45ba15e93c080daa90423f90f07143156b81af25..12396e30c3efe41caa68af2a53b2b0e9daca008f 100644
--- a/examples/maxwell/cavities.py
+++ b/examples/maxwell/cavities.py
@@ -30,8 +30,7 @@ import numpy as np
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from arraycontext.impl.pyopencl import PyOpenCLArrayContext
-from arraycontext.container.traversal import thaw
+from arraycontext import PyOpenCLArrayContext, thaw
 
 from grudge.shortcuts import set_up_rk4
 from grudge import DiscretizationCollection
@@ -122,7 +121,7 @@ def main(dims, write_output=False, order=4):
 
     if write_output:
         vis.write_vtk_file(
-            "fld-cavities-%04d.vtu" % step,
+            f"fld-cavities-{step:04d}.vtu",
             [
                 ("e", e),
                 ("h", h),
@@ -142,7 +141,7 @@ def main(dims, write_output=False, order=4):
                 if write_output:
                     e, h = maxwell_operator.split_eh(event.state_component)
                     vis.write_vtk_file(
-                        "fld-cavities-%04d.vtu" % step,
+                        f"fld-cavities-{step:04d}.vtu",
                         [
                             ("e", e),
                             ("h", h),
diff --git a/examples/old_symbolics/dagrt-fusion.py b/examples/old_symbolics/dagrt-fusion.py
index 8326c2ccb2862175aee59ae1ccbe7e66f418e932..ea6cb6bd6638f3da69a4b2ff3eb82115fb695c28 100755
--- a/examples/old_symbolics/dagrt-fusion.py
+++ b/examples/old_symbolics/dagrt-fusion.py
@@ -60,7 +60,7 @@ import pytest
 import dagrt.language as lang
 import pymbolic.primitives as p
 
-from arraycontext.impl.pyopencl import PyOpenCLArrayContext
+from arraycontext import PyOpenCLArrayContext
 
 from meshmode.dof_array import DOFArray
 
diff --git a/examples/wave/var-propagation-speed.py b/examples/wave/var-propagation-speed.py
index 3abff65a14080abd43e5b1f34c2e6349b51ede6b..d059deabfbc3a6aea0f6d2bd8926cdef445ed164 100644
--- a/examples/wave/var-propagation-speed.py
+++ b/examples/wave/var-propagation-speed.py
@@ -30,8 +30,7 @@ import numpy as np
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from arraycontext.impl.pyopencl import PyOpenCLArrayContext
-from arraycontext.container.traversal import thaw
+from arraycontext import PyOpenCLArrayContext, thaw
 
 from grudge.shortcuts import set_up_rk4
 from grudge import DiscretizationCollection
@@ -76,9 +75,7 @@ def main(write_output=False, order=4):
 
     x = thaw(op.nodes(dcoll), actx)
     ones = dcoll.zeros(actx) + 1
-    c = actx.np.where(np.dot(x, x) < 0.15,
-                      np.float32(0.1)*ones,
-                      np.float32(0.2)*ones)
+    c = actx.np.where(np.dot(x, x) < 0.15, 0.1 * ones, 0.2 * ones)
 
     from grudge.models.wave import VariableCoefficientWeakWaveOperator
     from meshmode.mesh import BTAG_ALL, BTAG_NONE
@@ -129,7 +126,7 @@ def main(write_output=False, order=4):
         u = fields[0]
         v = fields[1:]
         vis.write_vtk_file(
-            "fld-var-propogation-speed-%04d.vtu" % step,
+            f"fld-var-propogation-speed-{step:04d}.vtu",
             [
                 ("u", u),
                 ("v", v),
@@ -148,7 +145,7 @@ def main(write_output=False, order=4):
                       f"L2: {norm(u=event.state_component[0])}")
                 if write_output:
                     vis.write_vtk_file(
-                        "fld-var-propogation-speed-%04d.vtu" % step,
+                        f"fld-var-propogation-speed-{step:04d}.vtu",
                         [
                             ("u", event.state_component[0]),
                             ("v", event.state_component[1:]),
diff --git a/examples/wave/wave-min-mpi.py b/examples/wave/wave-min-mpi.py
index 7bfba873e94e43b17570278aa6bcb549f98a6618..c64c974606597da58fc3ac3dc27cf3e096fe5364 100644
--- a/examples/wave/wave-min-mpi.py
+++ b/examples/wave/wave-min-mpi.py
@@ -30,8 +30,7 @@ import numpy as np
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from arraycontext.impl.pyopencl import PyOpenCLArrayContext
-from arraycontext.container.traversal import thaw
+from arraycontext import PyOpenCLArrayContext, thaw
 
 from grudge.shortcuts import set_up_rk4
 from grudge import DiscretizationCollection
diff --git a/examples/wave/wave-min.py b/examples/wave/wave-min.py
index a50ae19fa20ec78b2eca610af6cadc8c417e1f3f..d0d7005833fff45e7027a2bd70599dcfa8c3ca2a 100644
--- a/examples/wave/wave-min.py
+++ b/examples/wave/wave-min.py
@@ -30,8 +30,7 @@ import numpy as np
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from arraycontext.impl.pyopencl import PyOpenCLArrayContext
-from arraycontext.container.traversal import thaw
+from arraycontext import PyOpenCLArrayContext, thaw
 
 from grudge.shortcuts import set_up_rk4
 from grudge import DiscretizationCollection
@@ -128,7 +127,7 @@ def main(write_output=False, order=4):
         u = fields[0]
         v = fields[1:]
         vis.write_vtk_file(
-            "fld-wave-min-%04d.vtu" % step,
+            f"fld-wave-min-{step:04d}.vtu",
             [
                 ("u", u),
                 ("v", v),
@@ -146,7 +145,7 @@ def main(write_output=False, order=4):
                       f"L2: {norm(u=event.state_component[0])}")
                 if write_output:
                     vis.write_vtk_file(
-                        "fld-wave-min-%04d.vtu" % step,
+                        f"fld-wave-min-{step:04d}.vtu",
                         [
                             ("u", event.state_component[0]),
                             ("v", event.state_component[1:]),
diff --git a/examples/wave/wave-op-mpi.py b/examples/wave/wave-op-mpi.py
index 96ddcf4314412c2c596736f43237b6ebc00018a7..3ed158c9ee54b970b0b3f9e35da8191552dba652 100644
--- a/examples/wave/wave-op-mpi.py
+++ b/examples/wave/wave-op-mpi.py
@@ -31,8 +31,7 @@ import numpy.linalg as la  # noqa
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from arraycontext.impl.pyopencl import PyOpenCLArrayContext
-from arraycontext.container.traversal import thaw
+from arraycontext import PyOpenCLArrayContext, thaw
 
 from pytools.obj_array import flat_obj_array
 
diff --git a/examples/wave/wave-op-var-velocity.py b/examples/wave/wave-op-var-velocity.py
index 1a416789f2902c7ac4be8dc8cd7a48f7f0872a81..4b9f2d3f9d13f14e1e82d2caddb28f9237096a95 100644
--- a/examples/wave/wave-op-var-velocity.py
+++ b/examples/wave/wave-op-var-velocity.py
@@ -31,8 +31,7 @@ import numpy.linalg as la  # noqa
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from arraycontext.impl.pyopencl import PyOpenCLArrayContext
-from arraycontext.container.traversal import thaw
+from arraycontext import PyOpenCLArrayContext, thaw
 
 from pytools.obj_array import flat_obj_array
 
@@ -98,7 +97,7 @@ def wave_operator(dcoll, c, w):
             flat_obj_array(
                 -op.weak_local_div(dcoll, dd_quad, c_quad*v_quad),
                 -op.weak_local_grad(dcoll, dd_quad, c_quad*u_quad) \
-                # pylint: disable=E1130
+                # pylint: disable=invalid-unary-operand-type
             ) + op.face_mass(
                 dcoll,
                 dd_allfaces_quad,
@@ -214,7 +213,7 @@ def main(write_output=False):
                   f"sol min: {op.nodal_min(dcoll, 'vol', fields[0])}")
             if write_output:
                 vis.write_vtk_file(
-                    "fld-wave-eager-var-velocity-%04d.vtu" % istep,
+                    f"fld-wave-eager-var-velocity-{istep:04d}.vtu",
                     [
                         ("c", c),
                         ("u", fields[0]),
diff --git a/examples/wave/wave-op.py b/examples/wave/wave-op.py
index b4f30db5f711acecd804d61b81216978cdae9c4a..50456233d1e2f10d3425330ac2fe7e7113ae9c0b 100644
--- a/examples/wave/wave-op.py
+++ b/examples/wave/wave-op.py
@@ -31,8 +31,7 @@ import numpy.linalg as la  # noqa
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from arraycontext.impl.pyopencl import PyOpenCLArrayContext
-from arraycontext.container.traversal import thaw
+from arraycontext import PyOpenCLArrayContext, thaw
 
 from pytools.obj_array import flat_obj_array
 
@@ -183,7 +182,7 @@ def main(write_output=False):
                   f"sol min: {op.nodal_min(dcoll, 'vol', fields[0])}")
             if write_output:
                 vis.write_vtk_file(
-                    "fld-wave-eager-%04d.vtu" % istep,
+                    f"fld-wave-eager-{istep:04d}.vtu",
                     [
                         ("u", fields[0]),
                         ("v", fields[1:]),
diff --git a/grudge/discretization.py b/grudge/discretization.py
index 632cff30d96eafc489584f286ef3ddc4a577dedf..2a272af10a808d5ebf005e11108df87399bd550a 100644
--- a/grudge/discretization.py
+++ b/grudge/discretization.py
@@ -38,7 +38,7 @@ from grudge.dof_desc import (
 
 import numpy as np  # noqa: F401
 
-from arraycontext.context import ArrayContext
+from arraycontext import ArrayContext
 
 from meshmode.discretization.connection import (
     FACE_RESTR_INTERIOR,
diff --git a/grudge/execution.py b/grudge/execution.py
index 7ed3c3dfaa6cabe1c5ebcea4184926d39bba488d..eeba079d521e108472dba0dd68b82da6725e0473 100644
--- a/grudge/execution.py
+++ b/grudge/execution.py
@@ -21,9 +21,7 @@ THE SOFTWARE.
 """
 
 
-from arraycontext.context import ArrayContext
-from arraycontext.loopy import make_loopy_program
-from arraycontext.container.traversal import thaw
+from arraycontext import ArrayContext, make_loopy_program, thaw
 
 from typing import Optional, Union, Dict
 from numbers import Number