diff --git a/src/libsyntax/ext/pipes/ast_builder.rs b/src/libsyntax/ext/pipes/ast_builder.rs
index ac0d507e61e..fda557f15b6 100644
--- a/src/libsyntax/ext/pipes/ast_builder.rs
+++ b/src/libsyntax/ext/pipes/ast_builder.rs
@@ -62,7 +62,7 @@ impl ast_builder for ext_ctxt {
         {mode: ast::infer(self.next_id()),
          ty: ty,
          ident: name,
-         // TODO: should this be the same as the infer id?
+         // FIXME #2886: should this be the same as the infer id?
          id: self.next_id()}
     }
 
@@ -90,7 +90,7 @@ impl ast_builder for ext_ctxt {
          output: output,
          purity: ast::impure_fn,
          cf: ast::return_val,
-         // TODO: we'll probably want a variant that does constrained
+         // FIXME #2886: we'll probably want a variant that does constrained
          // types.
          constraints: ~[]}
     }
@@ -157,7 +157,7 @@ impl ast_builder for ext_ctxt {
     }
 
     fn ty_path(path: @ast::path) -> @ast::ty {
-        // TODO: make sure the node ids are legal.
+        // FIXME #2886: make sure the node ids are legal.
         @{id: self.next_id(),
           node: ast::ty_path(path, self.next_id()),
           span: empty_span()}
diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs
index 113fdea42e4..df0c39bb266 100644
--- a/src/libsyntax/ext/tt/transcribe.rs
+++ b/src/libsyntax/ext/tt/transcribe.rs
@@ -12,7 +12,8 @@ enum tt_frame_up { /* to break a circularity */
     tt_frame_up(option<tt_frame>)
 }
 
-/* TODO: figure out how to have a uniquely linked stack, and change to `~` */
+/* FIXME #2811: figure out how to have a uniquely linked stack, and change to
+   `~` */
 ///an unzipping of `token_tree`s
 type tt_frame = @{
     readme: ~[ast::token_tree],
@@ -185,7 +186,8 @@ fn tt_next_token(&&r: tt_reader) -> {tok: token, sp: span} {
                     "attempted to repeat an expression containing no syntax \
                      variables matched as repeating at this depth");
               }
-              lis_contradiction(msg) { /* TODO blame macro invoker instead*/
+              lis_contradiction(msg) { /* FIXME #2887 blame macro invoker
+                                          instead*/
                 r.sp_diag.span_fatal(sp, msg);
               }
               lis_constraint(len, _) {
@@ -196,7 +198,8 @@ fn tt_next_token(&&r: tt_reader) -> {tok: token, sp: span} {
 
                 if len == 0 {
                     if !zerok {
-                        r.sp_diag.span_fatal(sp, /* TODO blame invoker */
+                        r.sp_diag.span_fatal(sp, /* FIXME #2887 blame invoker
+                                                  */
                                              "this must repeat at least \
                                               once");
                     }
@@ -206,7 +209,7 @@ fn tt_next_token(&&r: tt_reader) -> {tok: token, sp: span} {
               }
             }
           }
-          // TODO: think about span stuff here
+          // FIXME #2887: think about span stuff here
           tt_interpolate(sp, ident) {
             alt *lookup_cur_ad(r, ident) {
               /* sidestep the interpolation tricks for ident because
diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
index a78148b37c6..21ae0de60ec 100644
--- a/src/libsyntax/fold.rs
+++ b/src/libsyntax/fold.rs
@@ -280,7 +280,7 @@ fn noop_fold_item_underscore(i: item_, fld: ast_fold) -> item_ {
                        /* FIXME (#2543) */ copy methods)
           }
       item_mac(m) {
-        // TODO: we might actually want to do something here.
+        // FIXME #2888: we might actually want to do something here.
         item_mac(m)
       }
         };