diff --git a/dev/manual_tests/pageable_list.dart b/dev/manual_tests/pageable_list.dart
index 7910a08462..3e257805b6 100644
--- a/dev/manual_tests/pageable_list.dart
+++ b/dev/manual_tests/pageable_list.dart
@@ -22,8 +22,12 @@ class PageableListAppState extends State<PageableListApp> {
   @override
   void initState() {
     super.initState();
-    List<Size> cardSizes = [
-      [100.0, 300.0], [300.0, 100.0], [200.0, 400.0], [400.0, 400.0], [300.0, 400.0]
+    List<Size> cardSizes = <List<double>>[
+      <double>[100.0, 300.0],
+      <double>[300.0, 100.0],
+      <double>[200.0, 400.0],
+      <double>[400.0, 400.0],
+      <double>[300.0, 400.0]
     ]
     .map((List<double> args) => new Size(args[0], args[1]))
     .toList();
diff --git a/dev/tools/dartdoc.dart b/dev/tools/dartdoc.dart
index fb93a4d0c9..6e3e721b09 100644
--- a/dev/tools/dartdoc.dart
+++ b/dev/tools/dartdoc.dart
@@ -11,7 +11,7 @@ import 'package:path/path.dart' as path;
 /// This script expects to run with the cwd as the root of the flutter repo. It
 /// will generate documentation for the packages in `//packages/` and write the
 /// documentation to `//dev/docs/doc/api/`.
-main(List<String> args) async {
+Future<Null> main(List<String> args) async {
   // If we're run from the `tools` dir, set the cwd to the repo root.
   if (path.basename(Directory.current.path) == 'tools')
     Directory.current = Directory.current.parent.parent;
@@ -104,7 +104,7 @@ List<Directory> _findPackages() {
     .toList();
 }
 
-List<String> _libraryRefs() sync* {
+Iterable<String> _libraryRefs() sync* {
   for (Directory dir in _findPackages()) {
     String dirName = path.basename(dir.path);
 
diff --git a/dev/tools/mega_gallery.dart b/dev/tools/mega_gallery.dart
index 7ce1faabe5..3540af75e2 100644
--- a/dev/tools/mega_gallery.dart
+++ b/dev/tools/mega_gallery.dart
@@ -155,6 +155,7 @@ class SourceStats {
   int files = 0;
   int lines = 0;
 
+  @override
   String toString() => '${_comma(files)} files, ${_comma(lines)} lines';
 }
 
diff --git a/packages/flutter_tools/.analysis_options b/packages/flutter_tools/.analysis_options
deleted file mode 100644
index 32e9da2f16..0000000000
--- a/packages/flutter_tools/.analysis_options
+++ /dev/null
@@ -1,18 +0,0 @@
-# A temporary file to do some validation in the flutter_tools project. This will
-# go away once we unify `flutter analyze` and analysis server based products.
-
-analyzer:
-  language:
-    enableStrictCallChecks: true
-    enableSuperMixins: true
-  errors:
-    todo: ignore
-linter:
-  rules:
-    - avoid_empty_else
-    - always_declare_return_types
-    - always_specify_types
-    - annotate_overrides
-    - sort_unnamed_constructors_first
-    - unnecessary_brace_in_string_interp
-    - unnecessary_getters_setters