Clean up type parameters in comments

pkg/analyzer/lib/src/dart/ast/ast.dart

 // Copyright (c) 2014, 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 analyzer.src.dart.ast.ast;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
@@ skipping 43 matching lines @@
   Iterable<SyntacticEntity> get childEntities =>
       new ChildEntities()..addAll(_strings);
 
   @override
   Token get endToken => _strings.endToken;
 
   @override
   NodeList<StringLiteral> get strings => _strings;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitAdjacentStrings(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitAdjacentStrings(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _strings.accept(visitor);
   }
 
   @override
   void _appendStringValue(StringBuffer buffer) {
     int length = strings.length;
     for (int i = 0; i < length; i++) {
@@ skipping 229 matching lines @@
 
   @override
   Identifier get name => _name;
 
   @override
   void set name(Identifier name) {
     _name = _becomeParentOf(name as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitAnnotation(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitAnnotation(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _name?.accept(visitor);
     _constructorName?.accept(visitor);
     _arguments?.accept(visitor);
   }
 }
 
 /**
@@ skipping 89 matching lines @@
       throw new ArgumentError(
           "Expected ${_arguments.length} parameters, not ${parameters.length}");
     }
     _correspondingStaticParameters = parameters;
   }
 
   @override
   Token get endToken => rightParenthesis;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitArgumentList(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitArgumentList(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _arguments.accept(visitor);
   }
 
   /**
    * If
    * * the given [expression] is a child of this list,
    * * the AST structure has been resolved,
@@ skipping 102 matching lines @@
 
   @override
   TypeAnnotation get type => _type;
 
   @override
   void set type(TypeAnnotation type) {
     _type = _becomeParentOf(type as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitAsExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitAsExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _expression?.accept(visitor);
     _type?.accept(visitor);
   }
 }
 
 /**
  * An assert in the initializer list of a constructor.
@@ skipping 65 matching lines @@
 
   @override
   Expression get message => _message;
 
   @override
   void set message(Expression expression) {
     _message = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitAssertInitializer(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitAssertInitializer(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _condition?.accept(visitor);
     message?.accept(visitor);
   }
 }
 
 /**
  * An assert statement.
@@ skipping 69 matching lines @@
 
   @override
   Expression get message => _message;
 
   @override
   void set message(Expression expression) {
     _message = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitAssertStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitAssertStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _condition?.accept(visitor);
     message?.accept(visitor);
   }
 }
 
 /**
  * An assignment expression.
@@ skipping 162 matching lines @@
       return null;
     }
     List<ParameterElement> parameters = executableElement.parameters;
     if (parameters.length < 1) {
       return null;
     }
     return parameters[0];
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitAssignmentExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitAssignmentExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _leftHandSide?.accept(visitor);
     _rightHandSide?.accept(visitor);
   }
 }
 
 /**
  * A node in the AST structure for a Dart program.
@@ skipping 44 matching lines @@
     AstNode root = this;
     AstNode parent = this.parent;
     while (parent != null) {
       root = parent;
       parent = root.parent;
     }
     return root;
   }
 
   @override
-  AstNode/*=E*/ getAncestor/*<E extends AstNode>*/(
-      Predicate<AstNode> predicate) {
+  E getAncestor<E extends AstNode>(Predicate<AstNode> predicate) {
     // TODO(brianwilkerson) It is a bug that this method can return `this`.
     AstNode node = this;
     while (node != null && !predicate(node)) {
       node = node.parent;
     }
-    return node as AstNode/*=E*/;
+    return node as E;
   }
 
   @override
-  Object/*=E*/ getProperty/*<E>*/(String name) {
+  E getProperty<E>(String name) {
     if (_propertyMap == null) {
       return null;
     }
-    return _propertyMap[name] as Object/*=E*/;
+    return _propertyMap[name] as E;
   }
 
   @override
   void setProperty(String name, Object value) {
     if (value == null) {
       if (_propertyMap != null) {
         _propertyMap.remove(name);
         if (_propertyMap.isEmpty) {
           _propertyMap = null;
         }
@@ skipping 72 matching lines @@
 
   @override
   void set expression(Expression expression) {
     _expression = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
   int get precedence => 0;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitAwaitExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitAwaitExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _expression?.accept(visitor);
   }
 }
 
 /**
  * A binary (infix) expression.
  *
@@ skipping 109 matching lines @@
       return null;
     }
     List<ParameterElement> parameters = staticElement.parameters;
     if (parameters.length < 1) {
       return null;
     }
     return parameters[0];
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitBinaryExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitBinaryExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _leftOperand?.accept(visitor);
     _rightOperand?.accept(visitor);
   }
 }
 
 /**
  * A function body that consists of a block of statements.
@@ skipping 58 matching lines @@
   @override
   bool get isAsynchronous => keyword != null && keyword.lexeme == Parser.ASYNC;
 
   @override
   bool get isGenerator => star != null;
 
   @override
   bool get isSynchronous => keyword == null || keyword.lexeme != Parser.ASYNC;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitBlockFunctionBody(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitBlockFunctionBody(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _block?.accept(visitor);
   }
 }
 
 /**
  * A sequence of statements.
  *
@@ skipping 34 matching lines @@
     ..addAll(_statements)
     ..add(rightBracket);
 
   @override
   Token get endToken => rightBracket;
 
   @override
   NodeList<Statement> get statements => _statements;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitBlock(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitBlock(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _statements.accept(visitor);
   }
 }
 
 /**
  * A boolean literal expression.
  *
@@ skipping 25 matching lines @@
   Iterable<SyntacticEntity> get childEntities =>
       new ChildEntities()..add(literal);
 
   @override
   Token get endToken => literal;
 
   @override
   bool get isSynthetic => literal.isSynthetic;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitBooleanLiteral(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitBooleanLiteral(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     // There are no children to visit.
   }
 }
 
 /**
  * A break statement.
  *
@@ skipping 51 matching lines @@
 
   @override
   SimpleIdentifier get label => _label;
 
   @override
   void set label(SimpleIdentifier identifier) {
     _label = _becomeParentOf(identifier as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitBreakStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitBreakStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _label?.accept(visitor);
   }
 }
 
 /**
  * A sequence of cascaded expressions: expressions that share a common target.
  * There are three kinds of expressions that can be used in a cascade
@@ skipping 51 matching lines @@
 
   @override
   Expression get target => _target;
 
   @override
   void set target(Expression target) {
     _target = _becomeParentOf(target as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitCascadeExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitCascadeExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _target?.accept(visitor);
     _cascadeSections.accept(visitor);
   }
 }
 
 /**
  * A catch clause within a try statement.
@@ skipping 133 matching lines @@
 
   @override
   SimpleIdentifier get stackTraceParameter => _stackTraceParameter;
 
   @override
   void set stackTraceParameter(SimpleIdentifier parameter) {
     _stackTraceParameter = _becomeParentOf(parameter as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitCatchClause(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitCatchClause(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _exceptionType?.accept(visitor);
     _exceptionParameter?.accept(visitor);
     _stackTraceParameter?.accept(visitor);
     _body?.accept(visitor);
   }
 }
 
@@ skipping 199 matching lines @@
 
   @override
   WithClause get withClause => _withClause;
 
   @override
   void set withClause(WithClause withClause) {
     _withClause = _becomeParentOf(withClause as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitClassDeclaration(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitClassDeclaration(this);
 
   @override
   ConstructorDeclaration getConstructor(String name) {
     int length = _members.length;
     for (int i = 0; i < length; i++) {
       ClassMember classMember = _members[i];
       if (classMember is ConstructorDeclaration) {
         ConstructorDeclaration constructor = classMember;
         SimpleIdentifier constructorName = constructor.name;
         if (name == null && constructorName == null) {
@@ skipping 195 matching lines @@
 
   @override
   WithClause get withClause => _withClause;
 
   @override
   void set withClause(WithClause withClause) {
     _withClause = _becomeParentOf(withClause as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitClassTypeAlias(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitClassTypeAlias(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _name?.accept(visitor);
     _typeParameters?.accept(visitor);
     _superclass?.accept(visitor);
     _withClause?.accept(visitor);
     _implementsClause?.accept(visitor);
   }
@@ skipping 86 matching lines @@
   @override
   bool get isDocumentation => _type == CommentType.DOCUMENTATION;
 
   @override
   bool get isEndOfLine => _type == CommentType.END_OF_LINE;
 
   @override
   NodeList<CommentReference> get references => _references;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitComment(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitComment(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _references.accept(visitor);
   }
 
   /**
    * Create a block comment consisting of the given [tokens].
    */
   static Comment createBlockComment(List<Token> tokens) =>
@@ skipping 60 matching lines @@
 
   @override
   Identifier get identifier => _identifier;
 
   @override
   void set identifier(Identifier identifier) {
     _identifier = _becomeParentOf(identifier as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitCommentReference(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitCommentReference(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _identifier?.accept(visitor);
   }
 }
 
 /**
  * The possible types of comments that are recognized by the parser.
  */
@@ skipping 164 matching lines @@
   bool get _directivesAreBeforeDeclarations {
     if (_directives.isEmpty || _declarations.isEmpty) {
       return true;
     }
     Directive lastDirective = _directives[_directives.length - 1];
     CompilationUnitMember firstDeclaration = _declarations[0];
     return lastDirective.offset < firstDeclaration.offset;
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitCompilationUnit(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitCompilationUnit(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _scriptTag?.accept(visitor);
     if (_directivesAreBeforeDeclarations) {
       _directives.accept(visitor);
       _declarations.accept(visitor);
     } else {
       List<AstNode> sortedMembers = sortedDirectivesAndDeclarations;
       int length = sortedMembers.length;
@@ skipping 112 matching lines @@
 
   @override
   Expression get thenExpression => _thenExpression;
 
   @override
   void set thenExpression(Expression expression) {
     _thenExpression = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitConditionalExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _condition?.accept(visitor);
     _thenExpression?.accept(visitor);
     _elseExpression?.accept(visitor);
   }
 }
 
@@ skipping 88 matching lines @@
 
   @override
   StringLiteral get value => _value;
 
   @override
   void set value(StringLiteral value) {
     _value = _becomeParentOf(value as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitConfiguration(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitConfiguration(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _name?.accept(visitor);
     _value?.accept(visitor);
     _uri?.accept(visitor);
   }
 }
 
 /**
@@ skipping 208 matching lines @@
 
   @override
   Identifier get returnType => _returnType;
 
   @override
   void set returnType(Identifier typeName) {
     _returnType = _becomeParentOf(typeName as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitConstructorDeclaration(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _returnType?.accept(visitor);
     _name?.accept(visitor);
     _parameters?.accept(visitor);
     _initializers.accept(visitor);
     _redirectedConstructor?.accept(visitor);
@@ skipping 78 matching lines @@
 
   @override
   SimpleIdentifier get fieldName => _fieldName;
 
   @override
   void set fieldName(SimpleIdentifier identifier) {
     _fieldName = _becomeParentOf(identifier as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitConstructorFieldInitializer(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _fieldName?.accept(visitor);
     _expression?.accept(visitor);
   }
 }
 
 /**
@@ skipping 75 matching lines @@
 
   @override
   TypeName get type => _type;
 
   @override
   void set type(TypeName type) {
     _type = _becomeParentOf(type as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitConstructorName(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitConstructorName(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _type?.accept(visitor);
     _name?.accept(visitor);
   }
 }
 
 /**
  * A continue statement.
@@ skipping 50 matching lines @@
 
   @override
   SimpleIdentifier get label => _label;
 
   @override
   void set label(SimpleIdentifier identifier) {
     _label = _becomeParentOf(identifier as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitContinueStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitContinueStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _label?.accept(visitor);
   }
 }
 
 /**
  * A node that represents the declaration of one or more names. Each declared
  * name is visible within a name scope.
@@ skipping 89 matching lines @@
 
   @override
   TypeAnnotation get type => _type;
 
   @override
   void set type(TypeAnnotation type) {
     _type = _becomeParentOf(type as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitDeclaredIdentifier(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitDeclaredIdentifier(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _type?.accept(visitor);
     _identifier?.accept(visitor);
   }
 }
 
 /**
@@ skipping 101 matching lines @@
 
   @override
   NormalFormalParameter get parameter => _parameter;
 
   @override
   void set parameter(NormalFormalParameter formalParameter) {
     _parameter = _becomeParentOf(formalParameter as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitDefaultFormalParameter(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _parameter?.accept(visitor);
     _defaultValue?.accept(visitor);
   }
 }
 
 /**
@@ skipping 119 matching lines @@
 
   @override
   void set condition(Expression expression) {
     _condition = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
   Token get endToken => semicolon;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitDoStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitDoStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _body?.accept(visitor);
     _condition?.accept(visitor);
   }
 }
 
 /**
  * A dotted name, used in a configuration within an import or export directive.
@@ skipping 22 matching lines @@
   Iterable<SyntacticEntity> get childEntities =>
       new ChildEntities()..addAll(_components);
 
   @override
   NodeList<SimpleIdentifier> get components => _components;
 
   @override
   Token get endToken => _components.endToken;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitDottedName(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitDottedName(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _components.accept(visitor);
   }
 }
 
 /**
  * A floating point literal expression.
  *
@@ skipping 26 matching lines @@
   Token get beginToken => literal;
 
   @override
   Iterable<SyntacticEntity> get childEntities =>
       new ChildEntities()..add(literal);
 
   @override
   Token get endToken => literal;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitDoubleLiteral(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitDoubleLiteral(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     // There are no children to visit.
   }
 }
 
 /**
  * An empty function body, which can only appear in constructors or abstract
  * methods.
@@ skipping 19 matching lines @@
   Token get beginToken => semicolon;
 
   @override
   Iterable<SyntacticEntity> get childEntities =>
       new ChildEntities()..add(semicolon);
 
   @override
   Token get endToken => semicolon;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitEmptyFunctionBody(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitEmptyFunctionBody(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     // Empty function bodies have no children.
   }
 }
 
 /**
  * An empty statement.
  *
@@ skipping 15 matching lines @@
   Token get beginToken => semicolon;
 
   @override
   Iterable<SyntacticEntity> get childEntities =>
       new ChildEntities()..add(semicolon);
 
   @override
   Token get endToken => semicolon;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitEmptyStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitEmptyStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     // There are no children to visit.
   }
 }
 
 /**
  * The declaration of an enum constant.
  */
@@ skipping 31 matching lines @@
 
   @override
   SimpleIdentifier get name => _name;
 
   @override
   void set name(SimpleIdentifier name) {
     _name = _becomeParentOf(name as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitEnumConstantDeclaration(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _name?.accept(visitor);
   }
 }
 
 /**
@@ skipping 60 matching lines @@
   @override
   ClassElement get element => _name?.staticElement as ClassElement;
 
   @override
   Token get endToken => rightBracket;
 
   @override
   Token get firstTokenAfterCommentAndMetadata => enumKeyword;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitEnumDeclaration(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitEnumDeclaration(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _name?.accept(visitor);
     _constants.accept(visitor);
   }
 }
 
 /**
@@ skipping 43 matching lines @@
 
   @override
   LibraryElement get uriElement {
     if (element != null) {
       return element.exportedLibrary;
     }
     return null;
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitExportDirective(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitExportDirective(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     combinators.accept(visitor);
   }
 }
 
 /**
  * A function body consisting of a single expression.
@@ skipping 69 matching lines @@
     _expression = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
   bool get isAsynchronous => keyword != null;
 
   @override
   bool get isSynchronous => keyword == null;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitExpressionFunctionBody(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _expression?.accept(visitor);
   }
 }
 
 /**
  * A node that represents an expression.
@@ skipping 146 matching lines @@
 
   @override
   void set expression(Expression expression) {
     _expression = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
   bool get isSynthetic => _expression.isSynthetic && semicolon.isSynthetic;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitExpressionStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitExpressionStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _expression?.accept(visitor);
   }
 }
 
 /**
  * The "extends" clause in a class declaration.
  *
@@ skipping 31 matching lines @@
 
   @override
   TypeName get superclass => _superclass;
 
   @override
   void set superclass(TypeName name) {
     _superclass = _becomeParentOf(name as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitExtendsClause(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitExtendsClause(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _superclass?.accept(visitor);
   }
 }
 
 /**
  * The declaration of one or more fields of the same type.
  *
@@ skipping 67 matching lines @@
     } else if (staticKeyword != null) {
       return staticKeyword;
     }
     return _fieldList.beginToken;
   }
 
   @override
   bool get isStatic => staticKeyword != null;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitFieldDeclaration(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitFieldDeclaration(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _fieldList?.accept(visitor);
   }
 }
 
 /**
  * A field formal parameter.
@@ skipping 123 matching lines @@
 
   @override
   TypeParameterList get typeParameters => _typeParameters;
 
   @override
   void set typeParameters(TypeParameterList typeParameters) {
     _typeParameters = _becomeParentOf(typeParameters as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitFieldFormalParameter(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitFieldFormalParameter(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _type?.accept(visitor);
     identifier?.accept(visitor);
     _typeParameters?.accept(visitor);
     _parameters?.accept(visitor);
   }
 }
@@ skipping 140 matching lines @@
 
   @override
   DeclaredIdentifier get loopVariable => _loopVariable;
 
   @override
   void set loopVariable(DeclaredIdentifier variable) {
     _loopVariable = _becomeParentOf(variable as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitForEachStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitForEachStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _loopVariable?.accept(visitor);
     _identifier?.accept(visitor);
     _iterable?.accept(visitor);
     _body?.accept(visitor);
   }
 }
 
@@ skipping 121 matching lines @@
     for (int i = 0; i < count; i++) {
       types[i] = _parameters[i].element;
     }
     return types;
   }
 
   @override
   NodeList<FormalParameter> get parameters => _parameters;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitFormalParameterList(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitFormalParameterList(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _parameters.accept(visitor);
   }
 }
 
 /**
  * A for statement.
  *
@@ skipping 140 matching lines @@
 
   @override
   VariableDeclarationList get variables => _variableList;
 
   @override
   void set variables(VariableDeclarationList variableList) {
     _variableList = _becomeParentOf(variableList as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitForStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitForStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _variableList?.accept(visitor);
     _initialization?.accept(visitor);
     _condition?.accept(visitor);
     _updaters.accept(visitor);
     _body?.accept(visitor);
   }
 }
@@ skipping 164 matching lines @@
 
   @override
   TypeAnnotation get returnType => _returnType;
 
   @override
   void set returnType(TypeAnnotation type) {
     _returnType = _becomeParentOf(type as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitFunctionDeclaration(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitFunctionDeclaration(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _returnType?.accept(visitor);
     _name?.accept(visitor);
     _functionExpression?.accept(visitor);
   }
 }
 
@@ skipping 27 matching lines @@
 
   @override
   FunctionDeclaration get functionDeclaration => _functionDeclaration;
 
   @override
   void set functionDeclaration(FunctionDeclaration functionDeclaration) {
     _functionDeclaration = _becomeParentOf(functionDeclaration as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitFunctionDeclarationStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _functionDeclaration?.accept(visitor);
   }
 }
 
 /**
  * A function expression.
@@ skipping 87 matching lines @@
 
   @override
   TypeParameterList get typeParameters => _typeParameters;
 
   @override
   void set typeParameters(TypeParameterList typeParameters) {
     _typeParameters = _becomeParentOf(typeParameters as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitFunctionExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitFunctionExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _typeParameters?.accept(visitor);
     _parameters?.accept(visitor);
     _body?.accept(visitor);
   }
 }
 
 /**
@@ skipping 61 matching lines @@
 
   @override
   void set function(Expression expression) {
     _function = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
   int get precedence => 15;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitFunctionExpressionInvocation(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _function?.accept(visitor);
     _typeArguments?.accept(visitor);
     _argumentList?.accept(visitor);
   }
 }
 
@@ skipping 77 matching lines @@
 
   @override
   TypeParameterList get typeParameters => _typeParameters;
 
   @override
   void set typeParameters(TypeParameterList typeParameters) {
     _typeParameters = _becomeParentOf(typeParameters as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitFunctionTypeAlias(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitFunctionTypeAlias(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _returnType?.accept(visitor);
     _name?.accept(visitor);
     _typeParameters?.accept(visitor);
     _parameters?.accept(visitor);
   }
 }
@@ skipping 91 matching lines @@
 
   @override
   TypeParameterList get typeParameters => _typeParameters;
 
   @override
   void set typeParameters(TypeParameterList typeParameters) {
     _typeParameters = _becomeParentOf(typeParameters as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitFunctionTypedFormalParameter(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _returnType?.accept(visitor);
     identifier?.accept(visitor);
     _typeParameters?.accept(visitor);
     _parameters?.accept(visitor);
   }
@@ skipping 105 matching lines @@
   /**
    * Set the type parameters for the function type to the given list of
    * [typeParameters].
    */
   void set typeParameters(TypeParameterList typeParameters) {
     _typeParameters = _becomeParentOf(typeParameters as AstNodeImpl);
   }
 
   // TODO: implement type
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) {
+  E accept<E>(AstVisitor<E> visitor) {
     return visitor.visitGenericFunctionType(this);
   }
 
   @override
   void visitChildren(AstVisitor visitor) {
     _returnType?.accept(visitor);
     _typeParameters?.accept(visitor);
     _parameters?.accept(visitor);
   }
 }
@@ skipping 61 matching lines @@
 
   @override
   TypeParameterList get typeParameters => _typeParameters;
 
   @override
   void set typeParameters(TypeParameterList typeParameters) {
     _typeParameters = _becomeParentOf(typeParameters as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) {
+  E accept<E>(AstVisitor<E> visitor) {
     return visitor.visitGenericTypeAlias(this);
   }
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     name?.accept(visitor);
     _typeParameters?.accept(visitor);
     _functionType?.accept(visitor);
   }
@@ skipping 25 matching lines @@
     ..add(keyword)
     ..addAll(_hiddenNames);
 
   @override
   Token get endToken => _hiddenNames.endToken;
 
   @override
   NodeList<SimpleIdentifier> get hiddenNames => _hiddenNames;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitHideCombinator(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitHideCombinator(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _hiddenNames.accept(visitor);
   }
 }
 
 /**
  * A node that represents an identifier.
  *
@@ skipping 119 matching lines @@
 
   @override
   Statement get thenStatement => _thenStatement;
 
   @override
   void set thenStatement(Statement statement) {
     _thenStatement = _becomeParentOf(statement as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitIfStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitIfStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _condition?.accept(visitor);
     _thenStatement?.accept(visitor);
     _elseStatement?.accept(visitor);
   }
 }
 
 /**
@@ skipping 30 matching lines @@
     ..add(implementsKeyword)
     ..addAll(interfaces);
 
   @override
   Token get endToken => _interfaces.endToken;
 
   @override
   NodeList<TypeName> get interfaces => _interfaces;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitImplementsClause(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitImplementsClause(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _interfaces.accept(visitor);
   }
 }
 
 /**
  * An import directive.
  *
@@ skipping 69 matching lines @@
   @override
   LibraryElement get uriElement {
     ImportElement element = this.element;
     if (element == null) {
       return null;
     }
     return element.importedLibrary;
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitImportDirective(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitImportDirective(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _prefix?.accept(visitor);
     combinators.accept(visitor);
   }
 }
 
 /**
@@ skipping 171 matching lines @@
       return null;
     }
     List<ParameterElement> parameters = staticElement.parameters;
     if (parameters.length < 1) {
       return null;
     }
     return parameters[0];
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitIndexExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitIndexExpression(this);
 
   @override
   bool inGetterContext() {
     // TODO(brianwilkerson) Convert this to a getter.
     AstNode parent = this.parent;
     if (parent is AssignmentExpression) {
       AssignmentExpression assignment = parent;
       if (identical(assignment.leftHandSide, this) &&
           assignment.operator.type == TokenType.EQ) {
         return false;
@@ skipping 93 matching lines @@
   @override
   Token get endToken => _argumentList.endToken;
 
   @override
   bool get isConst => keyword?.keyword == Keyword.CONST;
 
   @override
   int get precedence => 16;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitInstanceCreationExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _constructorName?.accept(visitor);
     _argumentList?.accept(visitor);
   }
 }
 
 /**
@@ skipping 32 matching lines @@
   Token get beginToken => literal;
 
   @override
   Iterable<SyntacticEntity> get childEntities =>
       new ChildEntities()..add(literal);
 
   @override
   Token get endToken => literal;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitIntegerLiteral(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitIntegerLiteral(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     // There are no children to visit.
   }
 }
 
 /**
  * A node within a [StringInterpolation].
  *
@@ skipping 60 matching lines @@
 
   @override
   Expression get expression => _expression;
 
   @override
   void set expression(Expression expression) {
     _expression = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitInterpolationExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _expression?.accept(visitor);
   }
 }
 
 /**
  * A non-empty substring of an interpolated string.
@@ skipping 38 matching lines @@
   int get contentsOffset {
     int offset = contents.offset;
     String lexeme = contents.lexeme;
     return offset + new StringLexemeHelper(lexeme, true, true).start;
   }
 
   @override
   Token get endToken => contents;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitInterpolationString(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitInterpolationString(this);
 
   @override
   void visitChildren(AstVisitor visitor) {}
 }
 
 /**
  * Common base class for [FunctionExpressionInvocationImpl] and
  * [MethodInvocationImpl].
  */
 abstract class InvocationExpressionImpl extends ExpressionImpl
@@ skipping 104 matching lines @@
 
   @override
   TypeAnnotation get type => _type;
 
   @override
   void set type(TypeAnnotation type) {
     _type = _becomeParentOf(type as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitIsExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitIsExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _expression?.accept(visitor);
     _type?.accept(visitor);
   }
 }
 
 /**
  * A statement that has a label associated with them.
@@ skipping 44 matching lines @@
 
   @override
   void set statement(Statement statement) {
     _statement = _becomeParentOf(statement as AstNodeImpl);
   }
 
   @override
   Statement get unlabeled => _statement.unlabeled;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitLabeledStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitLabeledStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _labels.accept(visitor);
     _statement?.accept(visitor);
   }
 }
 
 /**
  * A label on either a [LabeledStatement] or a [NamedExpression].
@@ skipping 32 matching lines @@
 
   @override
   SimpleIdentifier get label => _label;
 
   @override
   void set label(SimpleIdentifier label) {
     _label = _becomeParentOf(label as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitLabel(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitLabel(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _label?.accept(visitor);
   }
 }
 
 /**
  * A library directive.
  *
@@ skipping 44 matching lines @@
 
   @override
   LibraryIdentifier get name => _name;
 
   @override
   void set name(LibraryIdentifier name) {
     _name = _becomeParentOf(name as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitLibraryDirective(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitLibraryDirective(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _name?.accept(visitor);
   }
 }
 
 /**
  * The identifier for a library.
@@ skipping 52 matching lines @@
   @override
   int get precedence => 15;
 
   @override
   Element get propagatedElement => null;
 
   @override
   Element get staticElement => null;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitLibraryIdentifier(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitLibraryIdentifier(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _components.accept(visitor);
   }
 }
 
 /**
  * A list literal.
  *
@@ skipping 49 matching lines @@
     ..addAll(_elements)
     ..add(rightBracket);
 
   @override
   NodeList<Expression> get elements => _elements;
 
   @override
   Token get endToken => rightBracket;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitListLiteral(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitListLiteral(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _elements.accept(visitor);
   }
 }
 
 /**
  * A node that represents a literal expression.
@@ skipping 84 matching lines @@
 
   @override
   Expression get value => _value;
 
   @override
   void set value(Expression expression) {
     _value = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitMapLiteralEntry(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitMapLiteralEntry(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _key?.accept(visitor);
     _value?.accept(visitor);
   }
 }
 
 /**
  * A literal map.
@@ skipping 50 matching lines @@
     ..addAll(entries)
     ..add(rightBracket);
 
   @override
   Token get endToken => rightBracket;
 
   @override
   NodeList<MapLiteralEntry> get entries => _entries;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitMapLiteral(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitMapLiteral(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _entries.accept(visitor);
   }
 }
 
 /**
  * A method declaration.
@@ skipping 190 matching lines @@
 
   @override
   TypeParameterList get typeParameters => _typeParameters;
 
   @override
   void set typeParameters(TypeParameterList typeParameters) {
     _typeParameters = _becomeParentOf(typeParameters as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitMethodDeclaration(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitMethodDeclaration(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _returnType?.accept(visitor);
     _name?.accept(visitor);
     _typeParameters?.accept(visitor);
     _parameters?.accept(visitor);
     _body?.accept(visitor);
   }
@@ skipping 100 matching lines @@
 
   @override
   Expression get target => _target;
 
   @override
   void set target(Expression expression) {
     _target = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitMethodInvocation(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitMethodInvocation(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _target?.accept(visitor);
     _methodName?.accept(visitor);
     _typeArguments?.accept(visitor);
     _argumentList?.accept(visitor);
   }
 }
 
@@ skipping 85 matching lines @@
 
   @override
   void set name(Label identifier) {
     _name = _becomeParentOf(identifier as AstNodeImpl);
   }
 
   @override
   int get precedence => 0;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitNamedExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitNamedExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _name?.accept(visitor);
     _expression?.accept(visitor);
   }
 }
 
 /**
  * A node that represents a directive that impacts the namespace of a library.
@@ skipping 115 matching lines @@
 
   @override
   StringLiteral get name => _name;
 
   @override
   void set name(StringLiteral name) {
     _name = _becomeParentOf(name as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitNativeClause(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitNativeClause(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _name?.accept(visitor);
   }
 }
 
 /**
  * A function body that consists of a native keyword followed by a string
  * literal.
@@ skipping 44 matching lines @@
 
   @override
   StringLiteral get stringLiteral => _stringLiteral;
 
   @override
   void set stringLiteral(StringLiteral stringLiteral) {
     _stringLiteral = _becomeParentOf(stringLiteral as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitNativeFunctionBody(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitNativeFunctionBody(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _stringLiteral?.accept(visitor);
   }
 }
 
 /**
  * A list of AST nodes that have a common parent.
  */
@@ skipping 282 matching lines @@
   Token get beginToken => literal;
 
   @override
   Iterable<SyntacticEntity> get childEntities =>
       new ChildEntities()..add(literal);
 
   @override
   Token get endToken => literal;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitNullLiteral(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitNullLiteral(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     // There are no children to visit.
   }
 }
 
 /**
  * A parenthesized expression.
  *
@@ skipping 53 matching lines @@
     // This is somewhat inefficient, but it avoids a stack overflow in the
     // degenerate case.
     Expression expression = _expression;
     while (expression is ParenthesizedExpressionImpl) {
       expression = (expression as ParenthesizedExpressionImpl)._expression;
     }
     return expression;
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitParenthesizedExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _expression?.accept(visitor);
   }
 }
 
 /**
  * A part directive.
@@ skipping 33 matching lines @@
   @override
   Token get firstTokenAfterCommentAndMetadata => partKeyword;
 
   @override
   Token get keyword => partKeyword;
 
   @override
   CompilationUnitElement get uriElement => element as CompilationUnitElement;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitPartDirective(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitPartDirective(this);
 }
 
 /**
  * A part-of directive.
  *
  *    partOfDirective ::=
  *        [Annotation] 'part' 'of' [Identifier] ';'
  */
 class PartOfDirectiveImpl extends DirectiveImpl implements PartOfDirective {
   /**
@@ skipping 70 matching lines @@
 
   @override
   StringLiteral get uri => _uri;
 
   @override
   void set uri(StringLiteral uri) {
     _uri = _becomeParentOf(uri as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitPartOfDirective(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitPartOfDirective(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _libraryName?.accept(visitor);
     _uri?.accept(visitor);
   }
 }
 
 /**
@@ skipping 97 matching lines @@
       return null;
     }
     List<ParameterElement> parameters = staticElement.parameters;
     if (parameters.length < 1) {
       return null;
     }
     return parameters[0];
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitPostfixExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitPostfixExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _operand?.accept(visitor);
   }
 }
 
 /**
  * An identifier that is prefixed or an access to an object property where the
  * target of the property access is a simple identifier.
@@ skipping 98 matching lines @@
 
   @override
   Element get staticElement {
     if (_identifier == null) {
       return null;
     }
     return _identifier.staticElement;
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitPrefixedIdentifier(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitPrefixedIdentifier(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _prefix?.accept(visitor);
     _identifier?.accept(visitor);
   }
 }
 
 /**
  * A prefix unary expression.
@@ skipping 91 matching lines @@
       return null;
     }
     List<ParameterElement> parameters = staticElement.parameters;
     if (parameters.length < 1) {
       return null;
     }
     return parameters[0];
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitPrefixExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitPrefixExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _operand?.accept(visitor);
   }
 }
 
 /**
  * The access of a property of an object.
  *
@@ skipping 79 matching lines @@
 
   @override
   Expression get target => _target;
 
   @override
   void set target(Expression expression) {
     _target = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitPropertyAccess(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitPropertyAccess(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _target?.accept(visitor);
     _propertyName?.accept(visitor);
   }
 }
 
 /**
  * The invocation of a constructor in the same class from within a constructor's
@@ skipping 67 matching lines @@
 
   @override
   void set constructorName(SimpleIdentifier identifier) {
     _constructorName = _becomeParentOf(identifier as AstNodeImpl);
   }
 
   @override
   Token get endToken => _argumentList.endToken;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitRedirectingConstructorInvocation(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _constructorName?.accept(visitor);
     _argumentList?.accept(visitor);
   }
 }
 
 /**
@@ skipping 21 matching lines @@
   Iterable<SyntacticEntity> get childEntities =>
       new ChildEntities()..add(rethrowKeyword);
 
   @override
   Token get endToken => rethrowKeyword;
 
   @override
   int get precedence => 0;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitRethrowExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitRethrowExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     // There are no children to visit.
   }
 }
 
 /**
  * A return statement.
  *
@@ skipping 38 matching lines @@
 
   @override
   Expression get expression => _expression;
 
   @override
   void set expression(Expression expression) {
     _expression = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitReturnStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitReturnStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _expression?.accept(visitor);
   }
 }
 
 /**
  * A script tag that can optionally occur at the beginning of a compilation unit.
  *
@@ skipping 15 matching lines @@
   Token get beginToken => scriptTag;
 
   @override
   Iterable<SyntacticEntity> get childEntities =>
       new ChildEntities()..add(scriptTag);
 
   @override
   Token get endToken => scriptTag;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitScriptTag(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitScriptTag(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     // There are no children to visit.
   }
 }
 
 /**
  * A combinator that restricts the names being imported to those in a given list.
  *
@@ skipping 20 matching lines @@
     ..add(keyword)
     ..addAll(_shownNames);
 
   @override
   Token get endToken => _shownNames.endToken;
 
   @override
   NodeList<SimpleIdentifier> get shownNames => _shownNames;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitShowCombinator(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitShowCombinator(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _shownNames.accept(visitor);
   }
 }
 
 /**
  * A simple formal parameter.
  *
@@ skipping 64 matching lines @@
 
   @override
   TypeAnnotation get type => _type;
 
   @override
   void set type(TypeAnnotation type) {
     _type = _becomeParentOf(type as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitSimpleFormalParameter(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _type?.accept(visitor);
     identifier?.accept(visitor);
   }
 }
 
@@ skipping 92 matching lines @@
 
   @override
   Element get staticElement => _staticElement;
 
   @override
   void set staticElement(Element element) {
     _staticElement = element;
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitSimpleIdentifier(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitSimpleIdentifier(this);
 
   @override
   bool inDeclarationContext() => false;
 
   @override
   bool inGetterContext() {
     // TODO(brianwilkerson) Convert this to a getter.
     AstNode initialParent = this.parent;
     AstNode parent = initialParent;
     AstNode target = this;
@@ skipping 159 matching lines @@
   @override
   void set value(String string) {
     _value = StringUtilities.intern(_value);
   }
 
   StringLexemeHelper get _helper {
     return new StringLexemeHelper(literal.lexeme, true, true);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitSimpleStringLiteral(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitSimpleStringLiteral(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     // There are no children to visit.
   }
 
   @override
   void _appendStringValue(StringBuffer buffer) {
     buffer.write(value);
   }
@@ skipping 90 matching lines @@
   @override
   bool get isSingleQuoted => _firstHelper.isSingleQuoted;
 
   StringLexemeHelper get _firstHelper {
     InterpolationString lastString = _elements.first;
     String lexeme = lastString.contents.lexeme;
     return new StringLexemeHelper(lexeme, true, false);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitStringInterpolation(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitStringInterpolation(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _elements.accept(visitor);
   }
 
   @override
   void _appendStringValue(StringBuffer buffer) {
     throw new ArgumentError();
   }
@@ skipping 195 matching lines @@
 
   @override
   void set constructorName(SimpleIdentifier identifier) {
     _constructorName = _becomeParentOf(identifier as AstNodeImpl);
   }
 
   @override
   Token get endToken => _argumentList.endToken;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitSuperConstructorInvocation(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _constructorName?.accept(visitor);
     _argumentList?.accept(visitor);
   }
 }
 
 /**
@@ skipping 20 matching lines @@
   Iterable<SyntacticEntity> get childEntities =>
       new ChildEntities()..add(superKeyword);
 
   @override
   Token get endToken => superKeyword;
 
   @override
   int get precedence => 16;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitSuperExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitSuperExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     // There are no children to visit.
   }
 }
 
 /**
  * A case in a switch statement.
  *
@@ skipping 26 matching lines @@
 
   @override
   Expression get expression => _expression;
 
   @override
   void set expression(Expression expression) {
     _expression = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitSwitchCase(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitSwitchCase(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     labels.accept(visitor);
     _expression?.accept(visitor);
     statements.accept(visitor);
   }
 }
 
 /**
@@ skipping 12 matching lines @@
       : super(labels, keyword, colon, statements);
 
   @override
   Iterable<SyntacticEntity> get childEntities => new ChildEntities()
     ..addAll(labels)
     ..add(keyword)
     ..add(colon)
     ..addAll(statements);
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitSwitchDefault(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitSwitchDefault(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     labels.accept(visitor);
     statements.accept(visitor);
   }
 }
 
 /**
  * An element within a switch statement.
@@ skipping 136 matching lines @@
 
   @override
   void set expression(Expression expression) {
     _expression = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
   NodeList<SwitchMember> get members => _members;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitSwitchStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitSwitchStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _expression?.accept(visitor);
     _members.accept(visitor);
   }
 }
 
 /**
  * A symbol literal expression.
@@ skipping 23 matching lines @@
   @override
   // TODO(paulberry): add "." tokens.
   Iterable<SyntacticEntity> get childEntities => new ChildEntities()
     ..add(poundSign)
     ..addAll(components);
 
   @override
   Token get endToken => components[components.length - 1];
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitSymbolLiteral(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitSymbolLiteral(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     // There are no children to visit.
   }
 }
 
 /**
  * A this expression.
  *
@@ skipping 18 matching lines @@
   Iterable<SyntacticEntity> get childEntities =>
       new ChildEntities()..add(thisKeyword);
 
   @override
   Token get endToken => thisKeyword;
 
   @override
   int get precedence => 16;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitThisExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitThisExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     // There are no children to visit.
   }
 }
 
 /**
  * A throw expression.
  *
@@ skipping 38 matching lines @@
 
   @override
   void set expression(Expression expression) {
     _expression = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
   int get precedence => 0;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitThrowExpression(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitThrowExpression(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _expression?.accept(visitor);
   }
 }
 
 /**
  * The declaration of one or more top-level variables of the same type.
  *
@@ skipping 42 matching lines @@
 
   @override
   VariableDeclarationList get variables => _variableList;
 
   @override
   void set variables(VariableDeclarationList variables) {
     _variableList = _becomeParentOf(variables as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitTopLevelVariableDeclaration(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _variableList?.accept(visitor);
   }
 }
 
 /**
@@ skipping 85 matching lines @@
 
   @override
   Block get finallyBlock => _finallyBlock;
 
   @override
   void set finallyBlock(Block block) {
     _finallyBlock = _becomeParentOf(block as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitTryStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitTryStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _body?.accept(visitor);
     _catchClauses.accept(visitor);
     _finallyBlock?.accept(visitor);
   }
 }
 
 /**
@@ skipping 84 matching lines @@
   // TODO(paulberry): Add commas.
   Iterable<SyntacticEntity> get childEntities => new ChildEntities()
     ..add(leftBracket)
     ..addAll(_arguments)
     ..add(rightBracket);
 
   @override
   Token get endToken => rightBracket;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitTypeArgumentList(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitTypeArgumentList(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _arguments.accept(visitor);
   }
 }
 
 /**
  * A literal that has a type associated with it.
  *
@@ skipping 113 matching lines @@
 
   @override
   TypeArgumentList get typeArguments => _typeArguments;
 
   @override
   void set typeArguments(TypeArgumentList typeArguments) {
     _typeArguments = _becomeParentOf(typeArguments as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitTypeName(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitTypeName(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _name?.accept(visitor);
     _typeArguments?.accept(visitor);
   }
 }
 
 /**
  * A type parameter.
@@ skipping 61 matching lines @@
 
   @override
   SimpleIdentifier get name => _name;
 
   @override
   void set name(SimpleIdentifier identifier) {
     _name = _becomeParentOf(identifier as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitTypeParameter(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitTypeParameter(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _name?.accept(visitor);
     _bound?.accept(visitor);
   }
 }
 
 /**
@@ skipping 35 matching lines @@
     ..addAll(_typeParameters)
     ..add(rightBracket);
 
   @override
   Token get endToken => rightBracket;
 
   @override
   NodeList<TypeParameter> get typeParameters => _typeParameters;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitTypeParameterList(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitTypeParameterList(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _typeParameters.accept(visitor);
   }
 }
 
 /**
  * A directive that references a URI.
  *
@@ skipping 214 matching lines @@
 
   @override
   SimpleIdentifier get name => _name;
 
   @override
   void set name(SimpleIdentifier identifier) {
     _name = _becomeParentOf(identifier as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitVariableDeclaration(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitVariableDeclaration(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _name?.accept(visitor);
     _initializer?.accept(visitor);
   }
 }
 
 /**
@@ skipping 74 matching lines @@
 
   @override
   void set type(TypeAnnotation type) {
     _type = _becomeParentOf(type as AstNodeImpl);
   }
 
   @override
   NodeList<VariableDeclaration> get variables => _variables;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitVariableDeclarationList(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     super.visitChildren(visitor);
     _type?.accept(visitor);
     _variables.accept(visitor);
   }
 }
 
@@ skipping 36 matching lines @@
 
   @override
   VariableDeclarationList get variables => _variableList;
 
   @override
   void set variables(VariableDeclarationList variables) {
     _variableList = _becomeParentOf(variables as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
+  E accept<E>(AstVisitor<E> visitor) =>
       visitor.visitVariableDeclarationStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _variableList?.accept(visitor);
   }
 }
 
 /**
  * A while statement.
@@ skipping 60 matching lines @@
 
   @override
   void set condition(Expression expression) {
     _condition = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
   Token get endToken => _body.endToken;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitWhileStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitWhileStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _condition?.accept(visitor);
     _body?.accept(visitor);
   }
 }
 
 /**
  * The with clause in a class declaration.
@@ skipping 28 matching lines @@
     ..add(withKeyword)
     ..addAll(_mixinTypes);
 
   @override
   Token get endToken => _mixinTypes.endToken;
 
   @override
   NodeList<TypeName> get mixinTypes => _mixinTypes;
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitWithClause(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitWithClause(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _mixinTypes.accept(visitor);
   }
 }
 
 /**
  * A yield statement.
  *
@@ skipping 55 matching lines @@
 
   @override
   Expression get expression => _expression;
 
   @override
   void set expression(Expression expression) {
     _expression = _becomeParentOf(expression as AstNodeImpl);
   }
 
   @override
-  dynamic/*=E*/ accept/*<E>*/(AstVisitor/*<E>*/ visitor) =>
-      visitor.visitYieldStatement(this);
+  E accept<E>(AstVisitor<E> visitor) => visitor.visitYieldStatement(this);
 
   @override
   void visitChildren(AstVisitor visitor) {
     _expression?.accept(visitor);
   }
 }