diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index db4db51d3cf..64ee56a5115 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -10,7 +10,7 @@
 #include "rust_env.h"
 #include "rust_port.h"
 
-// TODO(bblum): get rid of supervisors
+// FIXME (#1789) (bblum): get rid of supervisors
 
 // Tasks
 rust_task::rust_task(rust_sched_loop *sched_loop, rust_task_state state,
@@ -293,7 +293,7 @@ rust_task::kill() {
     LOG(this, task, "preparing to unwind task: 0x%" PRIxPTR, this);
 }
 
-// TODO(bblum): Move this to rust_builtin.cpp (cleanup)
+// (bblum): Move this to rust_builtin.cpp (cleanup)
 extern "C" CDECL
 bool rust_task_is_unwinding(rust_task *rt) {
     return rt->unwinding;
diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h
index d562d151894..8baa852378a 100644
--- a/src/rt/rust_task.h
+++ b/src/rt/rust_task.h
@@ -276,7 +276,7 @@ public:
     void fail(char const *expr, char const *file, size_t line);
 
     // Propagate failure to the entire rust runtime.
-    // TODO(bblum): maybe this can be done at rust-level?
+    // FIXME (#1868) (bblum): maybe this can be done at rust-level?
     void fail_sched_loop();
 
     // Disconnect from our supervisor.