diff --git a/src/librustc_front/lowering.rs b/src/librustc_front/lowering.rs
index a0466de999a..be184179451 100644
--- a/src/librustc_front/lowering.rs
+++ b/src/librustc_front/lowering.rs
@@ -142,7 +142,7 @@ impl<'a, 'hir> LoweringContext<'a> {
         }
     }
 
-    // panics if this LoweringContext's NodeIdAssigner is not a Session
+    // Panics if this LoweringContext's NodeIdAssigner is not able to emit diagnostics.
     fn diagnostic(&self) -> &Handler {
         self.id_assigner.diagnostic()
     }
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index deda0c59051..4782d3fb3b9 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -2076,8 +2076,8 @@ impl<'a> Parser<'a> {
         if end.is_none() && limits == RangeLimits::Closed {
             Err(self.span_fatal_help(self.span,
                                      "inclusive range with no end",
-                                     "currently, inclusive ranges must be bounded at the end \
-                                      (`...b` or `a...b`) -- see tracking issue #28237"))
+                                     "inclusive ranges must be bounded at the end \
+                                      (`...b` or `a...b`)"))
         } else {
             Ok(ExprKind::Range(start, end, limits))
         }
@@ -3016,7 +3016,8 @@ impl<'a> Parser<'a> {
                         this.parse_assoc_expr_with(op.precedence() + 1,
                             LhsExpr::NotYetParsed)
                 }),
-                // no operators are currently handled here
+                // We currently have no non-associative operators that are not handled above by
+                // the special cases. The code is here only for future convenience.
                 Fixity::None => self.with_res(
                     restrictions - Restrictions::RESTRICTION_STMT_EXPR,
                     |this| {
diff --git a/src/test/compile-fail/impossible_range.rs b/src/test/compile-fail/impossible_range.rs
index 169ba442240..94e048fed65 100644
--- a/src/test/compile-fail/impossible_range.rs
+++ b/src/test/compile-fail/impossible_range.rs
@@ -19,9 +19,9 @@ pub fn main() {
     0..1;
 
     ...; //~ERROR inclusive range with no end
-         //~^HELP 28237
+         //~^HELP bounded at the end
     0...; //~ERROR inclusive range with no end
-          //~^HELP 28237
+          //~^HELP bounded at the end
     ...1;
     0...1;
 }
diff --git a/src/test/parse-fail/range_inclusive.rs b/src/test/parse-fail/range_inclusive.rs
index be2a63a07bb..ce97372c668 100644
--- a/src/test/parse-fail/range_inclusive.rs
+++ b/src/test/parse-fail/range_inclusive.rs
@@ -14,6 +14,6 @@
 
 pub fn main() {
     for _ in 1... {} //~ERROR inclusive range with no end
-                     //~^HELP 28237
+                     //~^HELP bounded at the end
 }