diff --git a/expression_fwd.hpp b/expression_fwd.hpp
index 6bb3651..a7213f6 100644
--- a/expression_fwd.hpp
+++ b/expression_fwd.hpp
@@ -107,7 +107,7 @@ namespace boost::proto17 {
 
     // Tag types -- one per expr_kind:
 
-    struct expr_ref_tag {}; // TODO: Needed?
+    struct expr_ref_tag {};
 
     struct terminal_tag {};
     struct placeholder_tag {};
diff --git a/test/user_expression_transform.cpp b/test/user_expression_transform.cpp
index 76f2407..4f22037 100644
--- a/test/user_expression_transform.cpp
+++ b/test/user_expression_transform.cpp
@@ -166,15 +166,4 @@ TEST(user_expression_transform, test_user_expression_transform)
         // Note: +10 not done at the top level naxpy opportunity.
         EXPECT_EQ(result.value, 55 * 55 + 55);
     }
-
-    // TODO: This was an error (user:: vs. user_2::).  Document for users that
-    // they should catch an expression in an auto var to diagnose these sorts
-    // of things.
-#if 0
-    bp17::expression<
-        bp17::expr_kind::multiplies,
-        term<user_2::number>,
-        term<user_2::number>
-    > expr = a * x;
-#endif
 }
diff --git a/test/user_expression_transform_2.cpp b/test/user_expression_transform_2.cpp
index 9c206d4..73bc8f8 100644
--- a/test/user_expression_transform_2.cpp
+++ b/test/user_expression_transform_2.cpp
@@ -69,15 +69,4 @@ TEST(user_expression_transform_2, test_user_expression_transform_2)
 
         EXPECT_EQ(result.value, 55 * 55 + 55 + 10);
     }
-
-    // TODO: This was an error (user:: vs. user_2::).  Document for users that
-    // they should catch an expression in an auto var to diagnose these sorts
-    // of things.
-#if 0
-    bp17::expression<
-        bp17::expr_kind::multiplies,
-        term<user_2::number>,
-        term<user_2::number>
-    > expr = a * x;
-#endif
 }