diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs
index 0c016afd9750..562b029dfe8e 100644
--- a/src/comp/back/link.rs
+++ b/src/comp/back/link.rs
@@ -332,6 +332,7 @@ fn build_link_meta(&session::session sess, &ast::crate c,
                     sha.input_str(len_and_str(name));
                 }
                 case (ast::meta_list(_, _)) {
+                    // FIXME (#607): Implement this
                     fail "unimplemented meta_item variant";
                 }
             }
diff --git a/src/comp/front/attr.rs b/src/comp/front/attr.rs
index e29e5c95de70..1312851c5f01 100644
--- a/src/comp/front/attr.rs
+++ b/src/comp/front/attr.rs
@@ -96,7 +96,9 @@ fn eq(@ast::meta_item a, @ast::meta_item b) -> bool {
             }
         }
         case (ast::meta_list(?na, ?la)) {
-            // FIXME (#487): This involves probably sorting the list by name
+            // FIXME (#607): Needs implementing
+            // This involves probably sorting the list by name and
+            // meta_item variant
             fail "unimplemented meta_item variant"
         }
     }
@@ -115,6 +117,7 @@ fn contains(&vec[@ast::meta_item] haystack, @ast::meta_item needle) -> bool {
     ret false;
 }
 
+// FIXME: This needs to sort by meta_item variant in addition to the item name
 fn sort_meta_items(&vec[@ast::meta_item] items) -> vec[@ast::meta_item] {
     fn lteq(&@ast::meta_item ma, &@ast::meta_item mb) -> bool {
         fn key(&@ast::meta_item m) -> ast::ident {