Late night strong mode cleaning.

tests/compiler/dart2js/source_map_validator_helper.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.
 
 import 'dart:io';
 import 'dart:convert';
 import 'dart:async';
 
 import 'package:path/path.dart' as path;
 import 'package:expect/expect.dart';
@@ skipping 92 matching lines @@
 checkNames(
     Uri targetUri, Uri mapUri, SingleMapping sourceMap, CompilerImpl compiler) {
   Map<Uri, CompilationUnitElement> compilationUnitMap = {};
 
   void mapCompilationUnits(LibraryElement library) {
     library.compilationUnits.forEach((CompilationUnitElement compilationUnit) {
       compilationUnitMap[compilationUnit.script.readableUri] = compilationUnit;
     });
   }
 
-  compiler.libraryLoader.libraries.forEach((LibraryElement library) {
+  compiler.libraryLoader.libraries.forEach((_library) {
+    LibraryElement library = _library;
     mapCompilationUnits(library);
     if (library.patch != null) {
       mapCompilationUnits(library.patch);
     }
   });
 
   sourceMap.lines.forEach((TargetLineEntry line) {
     for (TargetEntry entry in line.entries) {
       if (entry.sourceNameId != null) {
         Uri uri = mapUri.resolve(sourceMap.urls[entry.sourceUrlId]);
-        Position targetPosition = new Position(line.line, entry.column);
         Position sourcePosition =
             new Position(entry.sourceLine, entry.sourceColumn);
         String name = sourceMap.names[entry.sourceNameId];
 
         CompilationUnitElement compilationUnit = compilationUnitMap[uri];
         Expect.isNotNull(
             compilationUnit, "No compilation unit found for $uri.");
 
         SourceFile sourceFile = compilationUnit.script.file;
 
         Position positionFromOffset(int offset) {
           Location location = sourceFile.getLocation(offset);
           int line = location.line - 1;
           int column = location.column - 1;
           return new Position(line, column);
         }
 
         Interval intervalFromElement(AstElement element) {
           if (!element.hasNode) return null;
 
           var begin = element.node.getBeginToken().charOffset;
-          var end = element.node.getEndToken();
-          end = end.charOffset + end.charCount;
+          var endToken = element.node.getEndToken();
+          int end = endToken.charOffset + endToken.charCount;
           return new Interval(
               positionFromOffset(begin), positionFromOffset(end));
         }
 
         AstElement findInnermost(AstElement element) {
           bool isInsideElement(FunctionElement closure) {
             Element enclosing = closure;
             while (enclosing != null) {
               if (enclosing == element) return true;
               enclosing = enclosing.enclosingElement;
             }
             return false;
           }
 
           if (element is MemberElement) {
             MemberElement member = element;
-            member.nestedClosures.forEach((closure) {
+            member.nestedClosures.forEach((dynamic closure) {
               var localFunction = closure.expression;
               Interval interval = intervalFromElement(localFunction);
               if (interval != null &&
                   interval.contains(sourcePosition) &&
                   isInsideElement(localFunction)) {
                 element = localFunction;
               }
             });
           }
           return element;
@@ skipping 25 matching lines @@
                 Expect.equals(
                     expectedName,
                     name,
                     "Unexpected name '${name}', "
                     "expected '${expectedName}' or for $innerElement.");
               }
             }
           }
         }
 
-        compilationUnit.forEachLocalMember((AstElement element) {
+        compilationUnit.forEachLocalMember((Element element) {
           if (element.isClass) {
             ClassElement classElement = element;
             classElement.forEachLocalMember(match);
           } else {
             match(element);
           }
         });
       }
     }
   });
@@ skipping 96 matching lines @@
   final Position end;
 
   Interval(this.begin, this.end);
 
   bool contains(Position other) {
     return begin <= other && other <= end;
   }
 
   String toString() => '$begin-$end';
 }