diff --git a/cedar-policy-cli/tests/integration_tests/corpus_tests.rs b/cedar-policy-cli/tests/integration_tests/corpus_tests.rs
index 094564d4f..8f6df4eb5 100644
--- a/cedar-policy-cli/tests/integration_tests/corpus_tests.rs
+++ b/cedar-policy-cli/tests/integration_tests/corpus_tests.rs
@@ -32,7 +32,7 @@ fn folder() -> &'static Path {
 // for now we have a single #[test] that runs all the corpus tests.
 // The disadvantage of this is that only one error message will be displayed,
 // even if many of the corpus tests fail.
-// TODO for the future: figure out if we can procedurally generate one #[test]
+// TODO(#438): figure out if we can procedurally generate one #[test]
 // per corpus test.
 #[test]
 // Don't run the corpus tests by default because they can take a minute to
diff --git a/cedar-policy-core/src/entities/conformance.rs b/cedar-policy-core/src/entities/conformance.rs
index 052f90b99..c3902061d 100644
--- a/cedar-policy-core/src/entities/conformance.rs
+++ b/cedar-policy-core/src/entities/conformance.rs
@@ -263,9 +263,10 @@ pub fn typecheck_restricted_expr_against_schematype(
     expected_ty: &SchemaType,
     extensions: Extensions<'_>,
 ) -> Result<(), TypecheckError> {
-    // TODO: instead of computing the `SchemaType` of `expr` and then checking
-    // whether the schematypes are "consistent", wouldn't it be less confusing,
-    // more efficient, and maybe even more precise to just typecheck directly?
+    // TODO(#440): instead of computing the `SchemaType` of `expr` and then
+    // checking whether the schematypes are "consistent", wouldn't it be less
+    // confusing, more efficient, and maybe even more precise to just typecheck
+    // directly?
     match schematype_of_restricted_expr(expr, extensions) {
         Ok(actual_ty) => {
             if actual_ty.is_consistent_with(expected_ty) {
diff --git a/cedar-policy-core/src/parser/cst_to_ast.rs b/cedar-policy-core/src/parser/cst_to_ast.rs
index 957b0b867..b90d287d2 100644
--- a/cedar-policy-core/src/parser/cst_to_ast.rs
+++ b/cedar-policy-core/src/parser/cst_to_ast.rs
@@ -1410,7 +1410,7 @@ impl ASTNode<Option<cst::Member>> {
         // Starting off with a failure and filtering items from the accessor list
         // can cause false error messages. We consider this acceptable for now because
         // they only occur along side a real error.
-        // TODO: eliminate the false errors (likely with `Option`s inside `AstAccessor`)
+        // TODO(#439): eliminate the false errors (likely with `Option`s inside `AstAccessor`)
         //
         // This algorithm is essentially an iterator over the accessor slice, but the
         // pattern match should be easier to read, since we have to check multiple elements
diff --git a/cedar-policy/tests/corpus_tests.rs b/cedar-policy/tests/corpus_tests.rs
index 37610fd9b..86fc4b817 100644
--- a/cedar-policy/tests/corpus_tests.rs
+++ b/cedar-policy/tests/corpus_tests.rs
@@ -40,7 +40,7 @@ fn folder() -> &'static Path {
 // for now we have a single #[test] that runs all the corpus tests.
 // The disadvantage of this is that only one error message will be displayed,
 // even if many of the corpus tests fail.
-// TODO for the future: figure out if we can procedurally generate one #[test]
+// TODO(#438): figure out if we can procedurally generate one #[test]
 // per corpus test.
 #[test]
 // Don't run the corpus tests by default because they can take a minute to