Reverts the following two commits:

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

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library elements.modelx;
 
 import '../common.dart';
 import '../common/names.dart' show Identifiers;
 import '../common/resolution.dart' show Resolution, ParsingContext;
 import '../compiler.dart' show Compiler;
@@ skipping 1327 matching lines @@
    * system.
    *
    * The [functionSignature] is not available until the typedef element has been
    * resolved.
    */
   FunctionSignature functionSignature;
 
   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;
   }
 
   void ensureResolved(Resolution resolution) {
     if (resolutionState == STATE_NOT_STARTED) {
       resolution.resolveTypedef(this);
     }
   }
 
@@ skipping 377 matching lines @@
    * kept to provide full information about parameter names through the mirror
    * system.
    */
   FunctionSignature _functionSignatureCache;
 
   FormalElementX(ElementKind elementKind, FunctionTypedElement enclosingElement,
       this.definitions, Identifier identifier)
       : 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;
 
   Token get position => identifier.getBeginToken();
 
   Node parseNode(ParsingContext parsing) => definitions;
 
   ResolutionDartType computeType(Resolution resolution) {
     assert(invariant(this, type != null,
@@ skipping 1665 matching lines @@
       body = node.asFunctionExpression().body;
     }
     return new ParsedResolvedAst(
         declaration,
         node,
         body,
         definingElement.treeElements,
         definingElement.compilationUnit.script.resourceUri);
   }
 }