diff --git a/lib/dom.dart b/lib/dom.dart
index 715ce83..08d1c12 100644
--- a/lib/dom.dart
+++ b/lib/dom.dart
@@ -830,8 +830,7 @@
   //
   // TODO(nweiz): we don't always need to create a new list. For example
   // forEach, every, any, ... could directly work on the _childNodes.
-  List<Element> get _filtered =>
-      List<Element>.from(_childNodes.where((n) => n is Element));
+  List<Element> get _filtered => _childNodes.whereType<Element>().toList();
 
   void forEach(void f(Element element)) {
     _filtered.forEach(f);
diff --git a/test/support.dart b/test/support.dart
index d97bff2..83e137a 100644
--- a/test/support.dart
+++ b/test/support.dart
@@ -26,7 +26,7 @@
 
 Iterable<String> getDataFiles(String subdirectory) {
   var dir = Directory(p.join(testDataDir, subdirectory));
-  return dir.listSync().where((f) => f is File).map((f) => f.path);
+  return dir.listSync().whereType<File>().map((f) => f.path);
 }
 
 // TODO(jmesserly): make this class simpler. We could probably split on