diff --git a/lib/src/scan.dart b/lib/src/scan.dart
index 6ba7a72..3231072 100644
--- a/lib/src/scan.dart
+++ b/lib/src/scan.dart
@@ -10,6 +10,13 @@
 ///
 /// [spec]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html
 import 'package:string_scanner/string_scanner.dart';
+/// HTTP entities.
+///
+/// Many of the regular expressions come from [section 2.2 of the HTTP
+/// spec][spec].
+///
+/// [spec]: http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html
+
 
 /// An HTTP token.
 final token = new RegExp(r'[^()<>@,;:"\\/[\]?={} \t\x00-\x1F\x7F]+');
@@ -37,8 +44,8 @@
 ///
 /// Once this is finished, [scanner] will be at the next non-LWS character in
 /// the string, or the end of the string.
-List/*<T>*/ parseList/*<T>*/(StringScanner scanner, /*=T*/ parseElement()) {
-  var result = /*<T>*/ [];
+List<T> parseList<T>(StringScanner scanner, T parseElement()) {
+  var result = <T>[];
 
   // Consume initial empty values.
   while (scanner.scan(",")) {
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index 3bc6b66..f2189f2 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -8,7 +8,7 @@
 ///
 /// [name] should describe the type of thing being parsed, and [value] should be
 /// its actual value.
-/*=T*/ wrapFormatException/*<T>*/(String name, String value, /*=T*/ body()) {
+T wrapFormatException<T>(String name, String value, T body()) {
   try {
     return body();
   } on SourceSpanFormatException catch (error) {
diff --git a/pubspec.yaml b/pubspec.yaml
index e2faf4c..7e20b41 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: http_parser
-version: 3.1.1
+version: 3.1.2-dev
 author: "Dart Team <misc@dartlang.org>"
 homepage: https://github.com/dart-lang/http_parser
 description: >
@@ -13,4 +13,4 @@
 dev_dependencies:
   test: "^0.12.0"
 environment:
-  sdk: ">=1.8.0 <2.0.0"
+  sdk: ">=1.21.0 <2.0.0-dev.infinity"