diff --git a/grudge/geometry/__init__.py b/grudge/geometry/__init__.py
index c5a83ba531f6bcf52371befc11c0401a4474df23..02dbc5f155e4d2f0058208b98075e17749222250 100644
--- a/grudge/geometry/__init__.py
+++ b/grudge/geometry/__init__.py
@@ -29,3 +29,10 @@ from grudge.geometry.metrics import (
     inverse_surface_metric_derivative,
     area_element
 )
+
+__all__ = (
+    "forward_metric_derivative_mat",
+    "inverse_metric_derivative_mat",
+    "inverse_surface_metric_derivative",
+    "area_element"
+)
diff --git a/grudge/geometry/metrics.py b/grudge/geometry/metrics.py
index c4f66da2aa9743e89c5992b053a01d85a9e889d4..44f741cdfcc5f1cbd174dc854761b39e108cc410 100644
--- a/grudge/geometry/metrics.py
+++ b/grudge/geometry/metrics.py
@@ -140,7 +140,8 @@ def inverse_metric_derivative_mat(actx, dcoll, dd=None):
 @memoize_on_first_arg
 def inverse_first_fundamental_form(actx, dcoll, dd):
 
-    if dcoll.ambient_dim == dcoll.dim:
+    dim = dcoll.dim
+    if dcoll.ambient_dim == dim:
         inv_mder = inverse_metric_derivative_mat(actx, dcoll, dd)
         inv_form1 = inv_mder.dot(inv_mder.T)
     else:
@@ -201,7 +202,8 @@ def inverse_metric_derivative(actx, dcoll, rst_axis, xyz_axis, dd):
 @memoize_on_first_arg
 def inverse_surface_metric_derivative(actx, dcoll, rst_axis, xyz_axis, dd=None):
 
-    if dcoll.ambient_dim == dcoll.dim:
+    dim = dcoll.dim
+    if dcoll.ambient_dim == dim:
         imd = inverse_metric_derivative(
             actx, dcoll, rst_axis, xyz_axis, dd=dd
         )