diff --git a/src/librustsyntax/print/pprust.rs b/src/librustsyntax/print/pprust.rs
index d67a2c822d0..b50f4f341a7 100644
--- a/src/librustsyntax/print/pprust.rs
+++ b/src/librustsyntax/print/pprust.rs
@@ -526,6 +526,10 @@ fn print_item(s: ps, &&item: @ast::item) {
                   /*
                      FIXME: collect all private items and print them
                      in a single "priv" section
+
+                     tjc: I'm not going to fix this yet b/c we might
+                     change how exports work, including for class items
+                     (see #1893)
                    */
              hardbreak_if_not_bol(s);
              maybe_print_comment(s, ci.span.lo);
@@ -816,7 +820,7 @@ fn print_mac(s: ps, m: ast::mac) {
           _ { word(s.s, " "); }
         }
         option::iter(arg, bind print_expr(s, _));
-        // FIXME: extension 'body'
+        // FIXME: extension 'body' (#2339)
       }
       ast::mac_embed_type(ty) {
         word(s.s, "#<");
@@ -1735,7 +1739,7 @@ fn escape_str(st: str, to_escape: char) -> str {
           cur {
             if cur == to_escape { out += "\\"; }
             // FIXME some (or all?) non-ascii things should be escaped
-
+            // (See #2306)
             str::push_char(out, cur);
           }
         }
diff --git a/src/librustsyntax/visit.rs b/src/librustsyntax/visit.rs
index 04b6c002cb2..d2188977af0 100644
--- a/src/librustsyntax/visit.rs
+++ b/src/librustsyntax/visit.rs
@@ -331,7 +331,7 @@ fn visit_mac<E>(m: mac, e: E, v: vt<E>) {
       ast::mac_embed_type(ty) { v.visit_ty(ty, e, v); }
       ast::mac_embed_block(blk) { v.visit_block(blk, e, v); }
       ast::mac_ellipsis { }
-      ast::mac_aq(_, e) { /* FIXME: maybe visit */ }
+      ast::mac_aq(_, e) { /* FIXME: maybe visit (Issue #2340) */ }
       ast::mac_var(_) { }
     }
 }