Reverts the following two commits:

pkg/compiler/lib/src/elements/modelx.dart

Index: pkg/compiler/lib/src/elements/modelx.dart
diff --git a/pkg/compiler/lib/src/elements/modelx.dart b/pkg/compiler/lib/src/elements/modelx.dart
index cd8e04cc0cd799c2d7b9e67dd3cc93ab64d5fa9d..6ff57cc0812853b7b839771819081f406764dea4 100644
--- a/pkg/compiler/lib/src/elements/modelx.dart
+++ b/pkg/compiler/lib/src/elements/modelx.dart
@@ -1345,7 +1345,7 @@ class TypedefElementX extends ElementX
   ResolutionTypedefType computeType(Resolution resolution) {
     if (thisTypeCache != null) return thisTypeCache;
     Typedef node = parseNode(resolution.parsingContext);
-    setThisAndRawTypes(createTypeVariables(node.templateParameters));
+    setThisAndRawTypes(createTypeVariables(node.typeParameters));
     ensureResolved(resolution);
     return thisTypeCache;
   }
@@ -1743,15 +1743,6 @@ class FormalElementX extends ElementX
       : this.identifier = identifier,
         super(identifier.source, elementKind, enclosingElement);
 
-  FormalElementX.unnamed(ElementKind elementKind,
-      FunctionTypedElement enclosingElement,
-      this.definitions)
-      : this.identifier = null,
-        super("<unnamed>", elementKind, enclosingElement);
-
-  /// Whether this is an unnamed parameter in a Function type.
-  bool get isUnnamed => identifier == null;
-
   FunctionTypedElement get functionDeclaration => enclosingElement;
 
   Modifiers get modifiers => definitions.modifiers;