diff --git a/.github/workflows/dart_ci.yml b/.github/workflows/dart_ci.yml
index 34c7a9b2..f5ab2439 100644
--- a/.github/workflows/dart_ci.yml
+++ b/.github/workflows/dart_ci.yml
@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Can't run on `beta` (Dart 3) until we're fully null-safe.
-        sdk: [2.18.7, stable]
+        # Can't run on `stable` (Dart 3) until we're fully null-safe.
+        sdk: [2.18.7]
     steps:
       - uses: actions/checkout@v2
       - uses: dart-lang/setup-dart@v1
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 6da2c16d..ed7c50a6 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,12 +1,25 @@
+include: package:workiva_analysis_options/v2.recommended.yaml
+
 analyzer:
   strong-mode:
+    # TODO change to false as part of the null safety major, which avoids us having to add a lot more casts
     implicit-casts: true
-    implicit-dynamic: true
+  errors:
+    must_call_super: error
+    comment_references: info
+    # This is too noisy since it warns for all lifecycle methods.
+    always_declare_return_types: ignore
+    # We very often need to annotate parameters when they're embedded in Maps
+    # with dynamic values, so this lint is noisy and wrong in those cases.
+    # See: https://github.com/dart-lang/linter/issues/1099
+    avoid_types_on_closure_parameters: ignore
+    # This makes string concatenation less readable in some cases
+    prefer_interpolation_to_compose_strings: ignore
+    # The following are ignored to avoid merge conflicts with null safety branch
+    directives_ordering: ignore
+    prefer_typing_uninitialized_variables: ignore
 linter:
   rules:
-    - avoid_private_typedef_functions
-    - await_only_futures
-    - cancel_subscriptions
-    - close_sinks
-    - unawaited_futures
-    - avoid_init_to_null
+    prefer_if_elements_to_conditional_expressions: false
+    overridden_fields: false
+    type_annotate_public_apis: false
diff --git a/example/geocodes/geocodes.dart b/example/geocodes/geocodes.dart
index c035e485..4596dd71 100644
--- a/example/geocodes/geocodes.dart
+++ b/example/geocodes/geocodes.dart
@@ -6,32 +6,30 @@ import 'dart:html';
 import 'package:react/react.dart' as react;
 import 'package:react/react_dom.dart' as react_dom;
 
-/**
- * Hello,
- *
- * This is the Dart portion of the tutorial for the Dart react package.
- *
- * We'll go through a simple app that queries the Google Maps API and shows the result to the user.
- * It also stores the search history and allows the user to reload past queries.
- *
- * In this file you'll find the structure and the logic of the app. There is also a `geocodes.html` file which contains
- * the mount point.
- *
- * Be sure that you understand the basic concepts of [React](http://facebook.github.io/react/) before reading this
- * tutorial.
- *
- * Enjoy!
- */
+/// Hello,
+///
+/// This is the Dart portion of the tutorial for the Dart react package.
+///
+/// We'll go through a simple app that queries the Google Maps API and shows the result to the user.
+/// It also stores the search history and allows the user to reload past queries.
+///
+/// In this file you'll find the structure and the logic of the app. There is also a `geocodes.html` file which contains
+/// the mount point.
+///
+/// Be sure that you understand the basic concepts of [React](https://reactjs.org/) before reading this
+/// tutorial.
+///
+/// Enjoy!
 
 /// Divide your app into components and conquer!
 ///
-/// This is the first custom [Component].
+/// This is the first custom `Component`.
 ///
 /// It is just an HTML `<tr>` element displaying a single API response to the user.
 class _GeocodesResultItem extends react.Component {
   /// The only function you must implement in the custom component is [render].
   ///
-  /// Every [Component] has a map of properties called [Component.props]. It can be specified during creation.
+  /// Every `Component` has a map of properties called `props`. It can be specified during creation.
   @override
   render() {
     return react.tr({}, [
@@ -42,13 +40,13 @@ class _GeocodesResultItem extends react.Component {
   }
 }
 
-/// Now we need to tell ReactJS that our custom [Component] exists by calling [registerComponent].
+/// Now we need to tell ReactJS that our custom `Component` exists by calling `registerComponent`.
 ///
 /// As a reward, it gives us a function, that takes the properties and returns our element. You'll see it in action
 /// shortly.
 ///
-/// This is the only correct way to create a [Component]. Do not use the constructor!
-var geocodesResultItem = react.registerComponent(() => new _GeocodesResultItem());
+/// This is the only correct way to create a `Component`. Do not use the constructor!
+var geocodesResultItem = react.registerComponent(() => _GeocodesResultItem());
 
 /// In this component we'll build an HTML `<table>` element full of the `<tr>` elements generated by
 /// [_GeocodesResultItem]
@@ -95,13 +93,13 @@ class _GeocodesResultList extends react.Component {
   }
 }
 
-var geocodesResultList = react.registerComponent(() => new _GeocodesResultList());
+var geocodesResultList = react.registerComponent(() => _GeocodesResultList());
 
-/// In this [Component] we'll build a search form.
+/// In this `Component` we'll build a search form.
 ///
-/// This [Component] illustrates that:
+/// This `Component` illustrates that:
 ///
-/// > The functions can be [Component] parameters _(handy for callbacks)_
+/// > The functions can be `Component` parameters _(handy for callbacks)_
 ///
 /// > The DOM [Element]s can be accessed using `ref`s.
 class _GeocodesForm extends react.Component {
@@ -158,16 +156,16 @@ class _GeocodesForm extends react.Component {
   /// Handle form submission via `props.onSubmit`
   onFormSubmit(react.SyntheticEvent event) {
     event.preventDefault();
-    InputElement inputElement = react_dom.findDOMNode(searchInputInstance);
+    final inputElement = react_dom.findDOMNode(searchInputInstance);
     // The input's value is accessed.
-    var address = inputElement.value;
+    final address = inputElement.value;
     inputElement.value = '';
     // Call the callback from the parent element is called.
     props['submitter'](address);
   }
 }
 
-var geocodesForm = react.registerComponent(() => new _GeocodesForm());
+var geocodesForm = react.registerComponent(() => _GeocodesForm());
 
 /// Renders an HTML `<li>` to be used as a child within the [_GeocodesHistoryList].
 class _GeocodesHistoryItem extends react.Component {
@@ -189,7 +187,7 @@ class _GeocodesHistoryItem extends react.Component {
   }
 }
 
-var geocodesHistoryItem = react.registerComponent(() => new _GeocodesHistoryItem());
+var geocodesHistoryItem = react.registerComponent(() => _GeocodesHistoryItem());
 
 /// Renders the "history list"
 ///
@@ -203,7 +201,7 @@ class _GeocodesHistoryList extends react.Component {
         {
           'key': 'list',
         },
-        new List.from(props['data'].keys.map((key) => geocodesHistoryItem({
+        List.from((props['data'] as Map).keys.map((key) => geocodesHistoryItem({
               'key': key,
               'query': props['data'][key]['query'],
               'status': props['data'][key]['status'],
@@ -214,11 +212,11 @@ class _GeocodesHistoryList extends react.Component {
   }
 }
 
-var geocodesHistoryList = react.registerComponent(() => new _GeocodesHistoryList());
+var geocodesHistoryList = react.registerComponent(() => _GeocodesHistoryList());
 
-/// The root [Component] of our application.
+/// The root `Component` of our application.
 ///
-/// Introduces [state]. Both [state] and [props] are valid locations to store [Component] data.
+/// Introduces [state]. Both [state] and [props] are valid locations to store `Component` data.
 ///
 /// However, there are some key differences to note:
 ///
@@ -228,7 +226,7 @@ var geocodesHistoryList = react.registerComponent(() => new _GeocodesHistoryList
 ///
 /// > When [state] is changed, the component will re-render.
 ///
-/// It's a common practice to store the application data in the [state] of the root [Component]. It will re-render
+/// It's a common practice to store the application data in the [state] of the root `Component`. It will re-render
 /// every time the state is changed. However, it is not required - you can also use normal variables and re-render
 /// manually if you wish.
 ///
@@ -247,23 +245,23 @@ class _GeocodesApp extends react.Component {
   /// Sends the [addressQuery] to the API and processes the result
   newQuery(String addressQuery) async {
     // Once the query is being sent, it appears in the history and is given an id.
-    var id = addQueryToHistory(addressQuery);
+    final id = addQueryToHistory(addressQuery);
 
     // Prepare the URL
     addressQuery = Uri.encodeQueryComponent(addressQuery);
-    var path = 'https://maps.googleapis.com/maps/api/geocode/json?address=$addressQuery';
+    final path = 'https://maps.googleapis.com/maps/api/geocode/json?address=$addressQuery';
 
     try {
       // Send the request
-      var raw = await HttpRequest.getString(path);
+      final raw = await HttpRequest.getString(path);
       // Delay the answer 2 more seconds, for test purposes
-      await new Future.delayed(new Duration(seconds: 2));
+      await Future.delayed(Duration(seconds: 2));
       // Is this the answer to the last request?
       if (id == last_id) {
         // If yes, query was `OK` and `shown_addresses` are replaced
         state['history'][id]['status'] = 'OK';
 
-        var data = json.decode(raw);
+        final data = json.decode(raw);
 
         // Calling `setState` will update the state and then repaint the component.
         //
@@ -291,7 +289,7 @@ class _GeocodesApp extends react.Component {
 
   /// Add a new [addressQuery] to the `state.history` Map with its status set to 'pending', then return its `id`.
   addQueryToHistory(String addressQuery) {
-    var id = ++last_id;
+    final id = ++last_id;
 
     state['history'][id] = {'query': addressQuery, 'status': 'pending'};
 
@@ -324,7 +322,7 @@ class _GeocodesApp extends react.Component {
   }
 }
 
-var geocodesApp = react.registerComponent(() => new _GeocodesApp());
+var geocodesApp = react.registerComponent(() => _GeocodesApp());
 
 /// And finally, a few magic commands to wire it all up!
 ///
diff --git a/example/geocodes/geocodes.html b/example/geocodes/geocodes.html
index 453ead1f..fef1312c 100644
--- a/example/geocodes/geocodes.html
+++ b/example/geocodes/geocodes.html
@@ -12,7 +12,7 @@
      * In this file you'll find the mount point of the app. There is also a `geocodes.dart` file which contains the
      * structure and the application logic.
      *
-     * Be sure that you understand the basic concepts of [React](http://facebook.github.io/react/) before reading this
+     * Be sure that you understand the basic concepts of [React](https://reactjs.org/) before reading this
      * tutorial.
      *
      * Enjoy!
diff --git a/example/js_components/js_components.dart b/example/js_components/js_components.dart
index b66e760b..08132513 100644
--- a/example/js_components/js_components.dart
+++ b/example/js_components/js_components.dart
@@ -10,33 +10,35 @@ import 'package:react/react_client/react_interop.dart';
 import 'package:react/react_dom.dart' as react_dom;
 
 main() {
-  var content = IndexComponent({});
+  final content = IndexComponent({});
 
   react_dom.render(content, querySelector('#content'));
 }
 
-var IndexComponent = react.registerComponent2(() => new _IndexComponent());
+var IndexComponent = react.registerComponent2(() => _IndexComponent());
 
 class _IndexComponent extends react.Component2 {
   SimpleCustomComponent simpleRef;
 
+  @override
   get initialState => {
         'open': false,
       };
 
   handleClose(_) {
-    this.setState({
+    setState({
       'open': false,
     });
   }
 
   handleClick(_) {
-    this.setState({
+    setState({
       'open': true,
     });
     print(simpleRef.getFoo());
   }
 
+  @override
   render() {
     return MuiThemeProvider(
       {
@@ -45,7 +47,7 @@ class _IndexComponent extends react.Component2 {
       SimpleCustom({
         'foo': 'Foo Prop from dart... IN A JAVASCRIPT COMPONENT!',
         'ref': (ref) {
-          simpleRef = ref;
+          simpleRef = ref as SimpleCustomComponent;
         }
       }),
       CssBaseline({}),
@@ -62,21 +64,21 @@ class _IndexComponent extends react.Component2 {
           DialogActions(
             {},
             Button({
-              'color': "primary",
+              'color': 'primary',
               'onClick': handleClose,
             }, 'OK'),
           )),
       Typography({
-        'variant': "h4",
+        'variant': 'h4',
         'gutterBottom': true,
       }, 'Material-UI'),
       Typography({
-        'variant': "subtitle1",
+        'variant': 'subtitle1',
         'gutterBottom': true,
       }, 'example project'),
       Button({
-        'variant': "contained",
-        'color': "secondary",
+        'variant': 'contained',
+        'color': 'secondary',
         'onClick': handleClick,
       }, Icon({}, 'fingerprint'), 'Super Secret Password'),
     );
@@ -98,7 +100,7 @@ external ReactClass get _SimpleCustomComponent;
 ///
 /// This converts the Dart props [Map] passed into it in the
 /// the same way props are converted for DOM components.
-final SimpleCustom = new ReactJsComponentFactoryProxy(_SimpleCustomComponent);
+final SimpleCustom = ReactJsComponentFactoryProxy(_SimpleCustomComponent);
 
 /// JS interop wrapper class for the component,
 /// allowing us to interact with component instances
@@ -131,13 +133,13 @@ class MaterialUI {
 external Map get theme;
 
 // All the Material UI components converted to dart Components
-final Button = new ReactJsComponentFactoryProxy(MaterialUI.Button);
-final CssBaseline = new ReactJsComponentFactoryProxy(MaterialUI.CssBaseline);
-final Dialog = new ReactJsComponentFactoryProxy(MaterialUI.Dialog);
-final DialogActions = new ReactJsComponentFactoryProxy(MaterialUI.DialogActions);
-final DialogContent = new ReactJsComponentFactoryProxy(MaterialUI.DialogContent);
-final DialogContentText = new ReactJsComponentFactoryProxy(MaterialUI.DialogContentText);
-final DialogTitle = new ReactJsComponentFactoryProxy(MaterialUI.DialogTitle);
-final Icon = new ReactJsComponentFactoryProxy(MaterialUI.Icon);
-final MuiThemeProvider = new ReactJsComponentFactoryProxy(MaterialUI.MuiThemeProvider);
-final Typography = new ReactJsComponentFactoryProxy(MaterialUI.Typography);
+final Button = ReactJsComponentFactoryProxy(MaterialUI.Button);
+final CssBaseline = ReactJsComponentFactoryProxy(MaterialUI.CssBaseline);
+final Dialog = ReactJsComponentFactoryProxy(MaterialUI.Dialog);
+final DialogActions = ReactJsComponentFactoryProxy(MaterialUI.DialogActions);
+final DialogContent = ReactJsComponentFactoryProxy(MaterialUI.DialogContent);
+final DialogContentText = ReactJsComponentFactoryProxy(MaterialUI.DialogContentText);
+final DialogTitle = ReactJsComponentFactoryProxy(MaterialUI.DialogTitle);
+final Icon = ReactJsComponentFactoryProxy(MaterialUI.Icon);
+final MuiThemeProvider = ReactJsComponentFactoryProxy(MaterialUI.MuiThemeProvider);
+final Typography = ReactJsComponentFactoryProxy(MaterialUI.Typography);
diff --git a/example/suspense/suspense.dart b/example/suspense/suspense.dart
index 6c8654fe..7517a647 100644
--- a/example/suspense/suspense.dart
+++ b/example/suspense/suspense.dart
@@ -18,7 +18,8 @@ external ReactClass jsLazy(Promise Function() factory);
 // Only intended for testing purposes, Please do not copy/paste this into repo.
 // This will most likely be added to the PUBLIC api in the future,
 // but needs more testing and Typing decisions to be made first.
-ReactJsComponentFactoryProxy lazy(Future<ReactComponentFactoryProxy> factory()) => ReactJsComponentFactoryProxy(
+ReactJsComponentFactoryProxy lazy(Future<ReactComponentFactoryProxy> Function() factory) =>
+    ReactJsComponentFactoryProxy(
       jsLazy(
         allowInterop(
           () => futureToPromise(
@@ -32,7 +33,7 @@ ReactJsComponentFactoryProxy lazy(Future<ReactComponentFactoryProxy> factory())
     );
 
 main() {
-  var content = wrapper({});
+  final content = wrapper({});
 
   react_dom.render(content, querySelector('#content'));
 }
diff --git a/example/test/call_and_nosuchmethod_test.dart b/example/test/call_and_nosuchmethod_test.dart
index 0dcf43af..6c379b65 100644
--- a/example/test/call_and_nosuchmethod_test.dart
+++ b/example/test/call_and_nosuchmethod_test.dart
@@ -1,16 +1,17 @@
 // ignore_for_file: deprecated_member_use_from_same_package
-import "dart:html";
+import 'dart:html';
 
-import "package:react/react_dom.dart" as react_dom;
-import "package:react/react.dart" as react;
+import 'package:react/react_dom.dart' as react_dom;
+import 'package:react/react.dart' as react;
 
 class _CustomComponent extends react.Component {
+  @override
   render() {
     return react.div({}, props['children']);
   }
 }
 
-var customComponent = react.registerComponent(() => new _CustomComponent());
+var customComponent = react.registerComponent(() => _CustomComponent());
 
 void main() {
   react_dom.render(
diff --git a/example/test/context_test.dart b/example/test/context_test.dart
index 61970e52..503ab13e 100644
--- a/example/test/context_test.dart
+++ b/example/test/context_test.dart
@@ -25,7 +25,7 @@ void main() {
           }),
           newContextConsumerObservedBitsComponent({
             'key': 'newConsumerObservedBitsComponent',
-            'unstable_observedBits': (1 << 2),
+            'unstable_observedBits': 1 << 2,
           }),
           newContextTypeConsumerComponentComponent({'key': 'newContextTypeConsumerComponent'}, []),
         ]),
diff --git a/example/test/error_boundary_test.dart b/example/test/error_boundary_test.dart
index 263a9a5b..f4e74ba5 100644
--- a/example/test/error_boundary_test.dart
+++ b/example/test/error_boundary_test.dart
@@ -42,19 +42,19 @@ final _ErrorBoundary = react.registerComponent2(() => _ErrorBoundaryComponent(),
 
 class _ErrorBoundaryComponent extends react.Component2 {
   @override
-  Map get initialState => {'hasError': false};
+  get initialState => {'hasError': false};
 
   @override
-  Map getDerivedStateFromError(dynamic error) => {'hasError': true};
+  getDerivedStateFromError(dynamic error) => {'hasError': true};
 
   @override
-  void componentDidCatch(dynamic error, ReactErrorInfo info) {
+  componentDidCatch(dynamic error, ReactErrorInfo info) {
     props['onComponentDidCatch']?.call(error, info);
   }
 
   @override
   render() {
-    return state['hasError'] ? 'Error boundary caught an error' : props['children'];
+    return (state['hasError'] as bool) ? 'Error boundary caught an error' : props['children'];
   }
 }
 
@@ -62,11 +62,11 @@ final _ThrowingComponent = react.registerComponent2(() => _ThrowingComponentComp
 
 class _ThrowingComponentComponent2 extends react.Component2 {
   @override
-  Map get initialState => {'shouldThrow': false};
+  get initialState => {'shouldThrow': false};
 
   @override
   render() {
-    if (state['shouldThrow']) {
+    if (state['shouldThrow'] as bool) {
       throw Exception();
     }
 
diff --git a/example/test/false_and_null_test.dart b/example/test/false_and_null_test.dart
index a73a365d..c26fe843 100644
--- a/example/test/false_and_null_test.dart
+++ b/example/test/false_and_null_test.dart
@@ -5,6 +5,7 @@ import 'package:react/react.dart' as react;
 import 'package:react/react_dom.dart' as react_dom;
 
 class _Component extends react.Component {
+  @override
   render() {
     if (props['hardCodedNullReturn'] == true) {
       return null;
@@ -14,10 +15,10 @@ class _Component extends react.Component {
   }
 }
 
-var component = react.registerComponent(() => new _Component());
+var component = react.registerComponent(() => _Component());
 
 void main() {
-  var content = react.div({}, [
+  final content = react.div({}, [
     react.p({}, 'Testing a dynamic return value of "null"...'),
     component({'returnValue': null, 'key': 0}),
     react.p({}, 'Testing a hard-coded return value of "null"...'),
diff --git a/example/test/function_component_test.dart b/example/test/function_component_test.dart
index b0327b7c..1435a583 100644
--- a/example/test/function_component_test.dart
+++ b/example/test/function_component_test.dart
@@ -3,7 +3,6 @@ import 'dart:math';
 
 import 'package:react/hooks.dart';
 import 'package:react/react.dart' as react;
-import 'package:react/react_client/react_interop.dart';
 import 'package:react/react_dom.dart' as react_dom;
 
 var hookTestFunctionComponent = react.registerFunctionComponent(HookTestComponent, displayName: 'useStateTest');
@@ -46,29 +45,29 @@ class _MemoTestDemoWrapper extends react.Component2 {
     return react.div(
       {'key': 'mtdw'},
       MemoTest({
-        'localCount': this.state['localCount'],
-        'someKeyThatMemoShouldIgnore': this.state['someKeyThatMemoShouldIgnore'],
+        'localCount': state['localCount'],
+        'someKeyThatMemoShouldIgnore': state['someKeyThatMemoShouldIgnore'],
       }),
       react.button({
         'type': 'button',
         'className': 'btn btn-primary',
         'style': {'marginRight': '10px'},
         'onClick': (_) {
-          this.setState({'localCount': this.state['localCount'] + 1});
+          setState({'localCount': state['localCount'] + 1});
         },
-      }, 'Update MemoTest props.localCount value (${this.state['localCount']})'),
+      }, 'Update MemoTest props.localCount value (${state['localCount']})'),
       react.button({
         'type': 'button',
         'className': 'btn btn-primary',
         'onClick': (_) {
-          this.setState({'someKeyThatMemoShouldIgnore': this.state['someKeyThatMemoShouldIgnore'] + 1});
+          setState({'someKeyThatMemoShouldIgnore': state['someKeyThatMemoShouldIgnore'] + 1});
         },
-      }, 'Update prop value that MemoTest will ignore (${this.state['someKeyThatMemoShouldIgnore']})'),
+      }, 'Update prop value that MemoTest will ignore (${state['someKeyThatMemoShouldIgnore']})'),
     );
   }
 }
 
-final MemoTest = react.memo2(react.registerFunctionComponent((Map props) {
+final MemoTest = react.memo2(react.registerFunctionComponent((props) {
   final context = useContext(TestNewContext);
   return react.div(
     {},
@@ -107,14 +106,15 @@ Map reducer(Map state, Map action) {
     case 'decrement':
       return {...state, 'count': state['count'] - 1};
     case 'reset':
-      return initializeCount(action['payload']);
+      return initializeCount(action['payload'] as int);
     default:
       return state;
   }
 }
 
 UseReducerTestComponent(Map props) {
-  final ReducerHook<Map, Map, int> state = useReducerLazy(reducer, props['initialCount'], initializeCount);
+  final initialCount = props['initialCount'] as int;
+  final state = useReducerLazy(reducer, initialCount, initializeCount);
 
   return react.Fragment({}, [
     state.state['count'],
@@ -134,7 +134,7 @@ UseReducerTestComponent(Map props) {
       'key': 'urt3',
       'onClick': (_) => state.dispatch({
             'type': 'reset',
-            'payload': props['initialCount'],
+            'payload': initialCount,
           })
     }, [
       'reset'
@@ -149,11 +149,11 @@ UseCallbackTestComponent(Map props) {
   final count = useState(0);
   final delta = useState(1);
 
-  var increment = useCallback((_) {
+  final increment = useCallback((_) {
     count.setWithUpdater((prev) => prev + delta.value);
   }, [delta.value]);
 
-  var incrementDelta = useCallback((_) {
+  final incrementDelta = useCallback((_) {
     delta.setWithUpdater((prev) => prev + 1);
   }, []);
 
@@ -178,7 +178,7 @@ UseContextTestComponent(Map props) {
 }
 
 int calculateChangedBits(currentValue, nextValue) {
-  int result = 1 << 1;
+  var result = 1 << 1;
   if (nextValue['renderCount'] % 2 == 0) {
     result |= 1 << 2;
   }
@@ -190,10 +190,12 @@ var TestNewContext = react.createContext<Map>({'renderCount': 0}, calculateChang
 var newContextProviderComponent = react.registerComponent2(() => _NewContextProviderComponent());
 
 class _NewContextProviderComponent extends react.Component2 {
+  @override
   get initialState => {'renderCount': 0, 'complexMap': false};
 
+  @override
   render() {
-    final provideMap = {'renderCount': this.state['renderCount']};
+    final provideMap = {'renderCount': state['renderCount']};
 
     return react.div({
       'key': 'ulasda',
@@ -208,7 +210,7 @@ class _NewContextProviderComponent extends react.Component2 {
         'onClick': _onButtonClick,
       }, 'Redraw'),
       react.br({'key': 'break1'}),
-      'TestContext.Provider props.value: ${provideMap}',
+      'TestContext.Provider props.value: $provideMap',
       react.br({'key': 'break2'}),
       react.br({'key': 'break3'}),
       TestNewContext.Provider(
@@ -219,7 +221,7 @@ class _NewContextProviderComponent extends react.Component2 {
   }
 
   _onButtonClick(event) {
-    this.setState({'renderCount': this.state['renderCount'] + 1, 'complexMap': false});
+    setState({'renderCount': state['renderCount'] + 1, 'complexMap': false});
   }
 }
 
@@ -283,7 +285,7 @@ UseMemoTestComponent2(Map props) {
   final fib = fibonacci(count.value);
 
   return react.Fragment({}, [
-    react.div({'key': 'div'}, ['Fibonacci of ${count.value} is ${fib}']),
+    react.div({'key': 'div'}, ['Fibonacci of ${count.value} is $fib']),
     react.button({'key': 'button1', 'onClick': (_) => count.setWithUpdater((prev) => prev + 1)}, ['+']),
     react.button({'key': 'button2', 'onClick': (_) => reRender.setWithUpdater((prev) => prev + 1)}, ['re-render']),
   ]);
@@ -295,7 +297,7 @@ final randomUseLayoutEffectTestComponent =
     react.registerFunctionComponent(RandomUseLayoutEffectTestComponent, displayName: 'randomUseLayoutEffectTest');
 
 RandomUseLayoutEffectTestComponent(Map props) {
-  StateHook<double> value = useState(0);
+  final value = useState<double>(0);
 
   useLayoutEffect(() {
     if (value.value == 0) {
@@ -315,7 +317,7 @@ final randomUseEffectTestComponent =
     react.registerFunctionComponent(RandomUseEffectTestComponent, displayName: 'randomUseEffectTest');
 
 RandomUseEffectTestComponent(Map props) {
-  StateHook<double> value = useState(0);
+  final value = useState<double>(0);
 
   useEffect(() {
     if (value.value == 0) {
@@ -355,7 +357,7 @@ final FancyInput = react.forwardRef2((props, ref) {
     'value': props['value'],
     'onChange': (e) => props['update'](e.target.value),
     'placeholder': props['placeholder'],
-    'style': {'borderColor': props['hasError'] ? 'crimson' : '#999'},
+    'style': {'borderColor': (props['hasError'] as bool) ? 'crimson' : '#999'},
   });
 });
 
@@ -368,8 +370,8 @@ UseImperativeHandleTestComponent(Map props) {
   final error = useState('');
   final message = useState('');
 
-  Ref cityRef = useRef<FancyInputApi>();
-  Ref stateRef = useRef<FancyInputApi>();
+  final cityRef = useRef<FancyInputApi>();
+  final stateRef = useRef<FancyInputApi>();
 
   validate(_) {
     if (!RegExp(r'^[a-zA-Z]+$').hasMatch(city.value)) {
@@ -413,21 +415,23 @@ UseImperativeHandleTestComponent(Map props) {
 }
 
 final FancyCounter = react.forwardRef2((props, ref) {
-  final count = useState(0);
+  final diff = props['diff'] as num;
+
+  final count = useState<num>(0);
 
   useImperativeHandle(
     ref,
     () {
       print('FancyCounter: useImperativeHandle re-assigns ref.current');
       return {
-        'increment': () => count.setWithUpdater((prev) => prev + props['diff']),
-        'decrement': () => count.setWithUpdater((prev) => prev - props['diff']),
+        'increment': () => count.setWithUpdater((prev) => prev + diff),
+        'decrement': () => count.setWithUpdater((prev) => prev - diff),
       };
     },
 
     /// This dependency prevents unnecessary calls of createHandle, by only re-assigning
-    /// ref.current when `props['diff']` changes.
-    [props['diff']],
+    /// ref.current when `diff` changes.
+    [diff],
   );
 
   return react.div({}, count.value);
@@ -465,7 +469,7 @@ UseImperativeHandleTestComponent2(Map props) {
 
 class ChatAPI {
   static void subscribeToFriendStatus(int id, Function handleStatusChange) =>
-      handleStatusChange({'isOnline': id % 2 == 0 ? true : false});
+      handleStatusChange({'isOnline': id % 2 == 0});
 
   static void unsubscribeFromFriendStatus(int id, Function handleStatusChange) =>
       handleStatusChange({'isOnline': false});
@@ -476,7 +480,7 @@ StateHook<bool> useFriendStatus(int friendID) {
   final isOnline = useState(false);
 
   void handleStatusChange(Map status) {
-    isOnline.set(status['isOnline']);
+    isOnline.set(status['isOnline'] as bool);
   }
 
   useEffect(() {
@@ -492,8 +496,8 @@ StateHook<bool> useFriendStatus(int friendID) {
   return isOnline;
 }
 
-final FriendListItem = react.registerFunctionComponent((Map props) {
-  final isOnline = useFriendStatus(props['friend']['id']);
+final FriendListItem = react.registerFunctionComponent((props) {
+  final isOnline = useFriendStatus(props['friend']['id'] as int);
 
   return react.li({
     'style': {'color': isOnline.value ? 'green' : 'black'}
@@ -503,7 +507,7 @@ final FriendListItem = react.registerFunctionComponent((Map props) {
 }, displayName: 'FriendListItem');
 
 final UseDebugValueTestComponent = react.registerFunctionComponent(
-    (Map props) => react.Fragment({}, [
+    (props) => react.Fragment({}, [
           FriendListItem({
             'key': 'friend1',
             'friend': {'id': 1, 'name': 'user 1'},
diff --git a/example/test/get_dom_node_test.dart b/example/test/get_dom_node_test.dart
index 08f1b587..2d1bc5c2 100644
--- a/example/test/get_dom_node_test.dart
+++ b/example/test/get_dom_node_test.dart
@@ -1,23 +1,26 @@
 // ignore_for_file: deprecated_member_use_from_same_package
-import "dart:html";
+import 'dart:html';
 
-import "package:react/react.dart" as react;
-import "package:react/react_dom.dart" as react_dom;
+import 'package:react/react.dart' as react;
+import 'package:react/react_dom.dart' as react_dom;
 
-customAssert(text, condition) {
-  if (condition)
-    print("${text} passed");
-  else
-    throw (text);
+// ignore: avoid_positional_boolean_parameters
+void customAssert(String text, bool condition) {
+  if (condition) {
+    print('$text passed');
+  } else {
+    throw Exception(text);
+  }
 }
 
-var ChildComponent = react.registerComponent(() => new _ChildComponent());
+var ChildComponent = react.registerComponent(() => _ChildComponent());
 
 class _ChildComponent extends react.Component {
   var counter = 0;
 
+  @override
   render() => react.div({}, [
-        "Test element",
+        'Test element',
         counter.toString(),
         react.button({
           'type': 'button',
@@ -31,31 +34,35 @@ class _ChildComponent extends react.Component {
       ]);
 }
 
-var simpleComponent = react.registerComponent(() => new SimpleComponent());
+var simpleComponent = react.registerComponent(() => SimpleComponent());
 
 class SimpleComponent extends react.Component {
   var refToSpan;
   var refToElement;
 
-  componentWillMount() => print("mount");
+  @override
+  componentWillMount() => print('mount');
 
-  componentWillUnmount() => print("unmount");
+  @override
+  componentWillUnmount() => print('unmount');
 
+  @override
   componentDidMount() {
-    customAssert("ref to span return span ", refToSpan.text == "Test");
-    customAssert("findDOMNode works on this", react_dom.findDOMNode(this) != null);
-    customAssert("random ref resolves to null", this.ref("someRandomRef") == null);
+    customAssert('ref to span return span ', refToSpan.text == 'Test');
+    customAssert('findDOMNode works on this', react_dom.findDOMNode(this) != null);
+    customAssert('random ref resolves to null', ref('someRandomRef') == null);
   }
 
   var counter = 0;
 
+  @override
   render() => react.div({}, [
         react.span({
           'key': 'span1',
-          "ref": (ref) {
+          'ref': (ref) {
             refToSpan = ref;
           }
-        }, "Test"),
+        }, 'Test'),
         react.span({'key': 'span2'}, counter),
         react.button({
           'type': 'button',
@@ -66,7 +73,7 @@ class SimpleComponent extends react.Component {
         react.br({'key': 'br'}),
         ChildComponent({
           'key': 'child',
-          "ref": (ref) {
+          'ref': (ref) {
             refToElement = ref;
           }
         }),
@@ -82,6 +89,6 @@ class SimpleComponent extends react.Component {
 var mountedNode = querySelector('#content');
 
 void main() {
-  var component = simpleComponent({});
+  final component = simpleComponent({});
   react_dom.render(component, mountedNode);
 }
diff --git a/example/test/order_test.dart b/example/test/order_test.dart
index a932e552..d8cc5c65 100644
--- a/example/test/order_test.dart
+++ b/example/test/order_test.dart
@@ -1,25 +1,28 @@
 // ignore_for_file: deprecated_member_use_from_same_package
 import 'dart:html';
 
-import "package:react/react.dart" as react;
-import "package:react/react_dom.dart" as react_dom;
+import 'package:react/react.dart' as react;
+import 'package:react/react_dom.dart' as react_dom;
 
 class _Item extends react.Component {
+  @override
   componentWillReceiveProps(newProps) {
-    print("Old props: $props");
-    print("New props: $newProps");
+    print('Old props: $props');
+    print('New props: $newProps');
   }
 
+  @override
   shouldComponentUpdate(nextProps, nextState) {
     return false;
   }
 
+  @override
   render() {
     return react.li({}, [props['text']]);
   }
 }
 
-var item = react.registerComponent(() => new _Item());
+var item = react.registerComponent(() => _Item());
 
 class _List extends react.Component {
   var items = ['item1', 'item2', 'item3'];
@@ -29,12 +32,13 @@ class _List extends react.Component {
     redraw();
   }
 
+  @override
   render() {
     return react.ul({'onClick': (e) => remove()}, items.map((text) => item({'text': text, 'key': text})));
   }
 }
 
-var list = react.registerComponent(() => new _List());
+var list = react.registerComponent(() => _List());
 
 void main() {
   react_dom.render(list({}), querySelector('#content'));
diff --git a/example/test/react_test.dart b/example/test/react_test.dart
index 122d917f..021303e4 100644
--- a/example/test/react_test.dart
+++ b/example/test/react_test.dart
@@ -1,8 +1,8 @@
-import "dart:html";
+import 'dart:html';
 
-import "package:react/react_dom.dart" as react_dom;
+import 'package:react/react_dom.dart' as react_dom;
 
-import "react_test_components.dart";
+import 'react_test_components.dart';
 
 void main() {
   react_dom.render(
diff --git a/example/test/react_test_components.dart b/example/test/react_test_components.dart
index 38de31e2..6a0db285 100644
--- a/example/test/react_test_components.dart
+++ b/example/test/react_test_components.dart
@@ -1,14 +1,14 @@
 // ignore_for_file: deprecated_member_use_from_same_package
-import "dart:async";
+import 'dart:async';
 
-import "package:react/react.dart" as react;
-import "package:react/react_dom.dart" as react_dom;
+import 'package:react/react.dart' as react;
+import 'package:react/react_dom.dart' as react_dom;
 
 class _HelloComponent extends react.Component2 {
   @override
   get propTypes => {
         'name': (Map props, info) {
-          String propValue = props[info.propName];
+          final propValue = props[info.propName] as String;
           if (propValue.length > 20) {
             return ArgumentError('($propValue) is too long. $propValue has a max length of 20 characters.');
           }
@@ -16,23 +16,26 @@ class _HelloComponent extends react.Component2 {
         },
       };
 
+  @override
   render() {
     return react.span({}, ["Hello ${props['name']}!"]);
   }
 }
 
-var helloComponent = react.registerComponent(() => new _HelloComponent());
+var helloComponent = react.registerComponent(() => _HelloComponent());
 
 class _HelloGreeter extends react.Component {
   var myInput;
-  getInitialState() => {"name": "World"};
+  @override
+  getInitialState() => {'name': 'World'};
 
   onInputChange(e) {
-    var input = react_dom.findDOMNode(myInput);
+    final input = react_dom.findDOMNode(myInput);
     print(input.borderEdge);
     setState({'name': e.target.value});
   }
 
+  @override
   render() {
     return react.div({}, [
       react.input({
@@ -47,15 +50,19 @@ class _HelloGreeter extends react.Component {
   }
 }
 
-var helloGreeter = react.registerComponent(() => new _HelloGreeter());
+var helloGreeter = react.registerComponent(() => _HelloGreeter());
 
 class _CheckBoxComponent extends react.Component {
-  getInitialState() => {"checked": false};
+  @override
+  getInitialState() => {'checked': false};
+
+  bool get checked => state['checked'] as bool;
 
   _handleChange(e) {
-    this.setState({'checked': e.target.checked});
+    setState({'checked': e.target.checked});
   }
 
+  @override
   render() {
     return react.div({
       'className': 'form-check'
@@ -65,94 +72,105 @@ class _CheckBoxComponent extends react.Component {
         'key': 'input',
         'className': 'form-check-input',
         'type': 'checkbox',
-        'checked': state['checked'],
+        'checked': checked,
         'onChange': _handleChange,
       }),
       react.label({
         'htmlFor': 'doTheDishes',
         'key': 'label',
-        'className': 'form-check-label ' + (this.state['checked'] ? 'striked' : 'not-striked')
+        'className': 'form-check-label ${checked ? 'striked' : 'not-striked'}'
       }, 'do the dishes'),
     ]);
   }
 }
 
-var checkBoxComponent = react.registerComponent(() => new _CheckBoxComponent());
+var checkBoxComponent = react.registerComponent(() => _CheckBoxComponent());
 
 class _ClockComponent extends react.Component {
   Timer timer;
 
+  @override
   getInitialState() => {'secondsElapsed': 0};
 
-  Map getDefaultProps() => {'refreshRate': 1000};
+  @override
+  getDefaultProps() => {'refreshRate': 1000};
 
-  void componentWillMount() {
-    timer = new Timer.periodic(new Duration(milliseconds: this.props["refreshRate"]), this.tick);
+  @override
+  componentWillMount() {
+    timer = Timer.periodic(Duration(milliseconds: props['refreshRate'] as int), tick);
   }
 
-  void componentWillUnmount() {
+  @override
+  componentWillUnmount() {
     timer.cancel();
   }
 
-  void componentDidMount() {
-    var rootNode = react_dom.findDOMNode(this);
-    rootNode.style.backgroundColor = "#FFAAAA";
+  @override
+  componentDidMount() {
+    final rootNode = react_dom.findDOMNode(this);
+    rootNode.style.backgroundColor = '#FFAAAA';
   }
 
-  bool shouldComponentUpdate(nextProps, nextState) {
+  @override
+  shouldComponentUpdate(nextProps, nextState) {
     //print("Next state: $nextState, props: $nextProps");
     //print("Old state: $state, props: $props");
     return nextState['secondsElapsed'] % 2 == 1;
   }
 
-  void componentWillReceiveProps(nextProps) {
-    print("Received props: $nextProps");
+  @override
+  componentWillReceiveProps(nextProps) {
+    print('Received props: $nextProps');
   }
 
   tick(Timer timer) {
     setState({'secondsElapsed': state['secondsElapsed'] + 1});
   }
 
+  @override
   render() {
-    return react.span({'onClick': (event) => print("Hello World!")},
+    return react.span({'onClick': (event) => print('Hello World!')},
 //        { 'onClick': (event, [domid = null]) => print("Hello World!") },
-        ["Seconds elapsed: ", "${state['secondsElapsed']}"]);
+        ['Seconds elapsed: ', "${state['secondsElapsed']}"]);
   }
 }
 
-var clockComponent = react.registerComponent(() => new _ClockComponent());
+var clockComponent = react.registerComponent(() => _ClockComponent());
 
 class _ListComponent extends react.Component {
-  Map getInitialState() {
+  @override
+  getInitialState() {
     return {
-      "items": new List.from([0, 1, 2, 3])
+      'items': List.from([0, 1, 2, 3])
     };
   }
 
-  void componentWillUpdate(nextProps, nextState) {
-    if (nextState["items"].length > state["items"].length) {
-      print("Adding " + nextState["items"].last.toString());
+  @override
+  componentWillUpdate(nextProps, nextState) {
+    if ((nextState['items'] as List).length > (state['items'] as List).length) {
+      print('Adding ' + (nextState['items'] as List).last.toString());
     }
   }
 
-  void componentDidUpdate(prevProps, prevState) {
-    if (prevState["items"].length > state["items"].length) {
-      print("Removed " + prevState["items"].first.toString());
+  @override
+  componentDidUpdate(prevProps, prevState) {
+    if ((prevState['items'] as List).length > (state['items'] as List).length) {
+      print('Removed ' + (prevState['items'] as List).first.toString());
     }
   }
 
   int iterator = 3;
 
   void addItem(event) {
-    List items = new List.from(state["items"]);
-    items.add(++iterator);
-    setState({"items": items});
+    final items = [...state['items'] as List, ++iterator];
+    setState({'items': items});
   }
 
-  dynamic render() {
-    List<dynamic> items = [];
-    for (var item in state['items']) {
-      items.add(react.li({"key": item}, "$item"));
+  @override
+  render() {
+    final items = [];
+    for (final item in state['items']) {
+      items.add(react.li({'key': item}, '$item'));
     }
 
     return react.div({}, [
@@ -167,30 +185,32 @@ class _ListComponent extends react.Component {
   }
 }
 
-var listComponent = react.registerComponent(() => new _ListComponent());
+var listComponent = react.registerComponent(() => _ListComponent());
 
 class _MainComponent extends react.Component {
+  @override
   render() {
     return react.div({}, props['children']);
   }
 }
 
-var mainComponent = react.registerComponent(() => new _MainComponent());
+var mainComponent = react.registerComponent(() => _MainComponent());
 
 /////
 // REACT OLD CONTEXT COMPONENTS
 /////
 class _LegacyContextComponent extends react.Component {
   @override
-  Iterable<String> get childContextKeys => const ['foo', 'bar', 'renderCount'];
+  get childContextKeys => const ['foo', 'bar', 'renderCount'];
 
   @override
-  Map<String, dynamic> getChildContext() => {
+  getChildContext() => {
         'foo': {'object': 'with value'},
         'bar': true,
-        'renderCount': this.state['renderCount']
+        'renderCount': state['renderCount']
       };
 
+  @override
   render() {
     return react.ul({
       'key': 'ul'
@@ -206,16 +226,17 @@ class _LegacyContextComponent extends react.Component {
   }
 
   _onButtonClick(event) {
-    this.setState({'renderCount': (this.state['renderCount'] ?? 0) + 1});
+    setState({'renderCount': (state['renderCount'] ?? 0) + 1});
   }
 }
 
-var legacyContextComponent = react.registerComponent(() => new _LegacyContextComponent());
+var legacyContextComponent = react.registerComponent(() => _LegacyContextComponent());
 
 class _LegacyContextConsumerComponent extends react.Component {
   @override
-  Iterable<String> get contextKeys => const ['foo'];
+  get contextKeys => const ['foo'];
 
+  @override
   render() {
     return react.ul({
       'key': 'ul'
@@ -229,12 +250,13 @@ class _LegacyContextConsumerComponent extends react.Component {
   }
 }
 
-var legacyContextConsumerComponent = react.registerComponent(() => new _LegacyContextConsumerComponent());
+var legacyContextConsumerComponent = react.registerComponent(() => _LegacyContextConsumerComponent());
 
 class _GrandchildLegacyContextConsumerComponent extends react.Component {
   @override
-  Iterable<String> get contextKeys => const ['renderCount'];
+  get contextKeys => const ['renderCount'];
 
+  @override
   render() {
     return react.ul({
       'key': 'ul'
@@ -246,12 +268,13 @@ class _GrandchildLegacyContextConsumerComponent extends react.Component {
 }
 
 var grandchildLegacyContextConsumerComponent =
-    react.registerComponent(() => new _GrandchildLegacyContextConsumerComponent());
+    react.registerComponent(() => _GrandchildLegacyContextConsumerComponent());
 
 ////
 // REACT NEW CONTEXT COMPONENTS
 ////
 class _NewContextRefComponent extends react.Component2 {
+  @override
   render() {
     return react.div({}, props['children']);
   }
@@ -261,10 +284,10 @@ class _NewContextRefComponent extends react.Component2 {
   }
 }
 
-var newContextRefComponent = react.registerComponent(() => new _NewContextRefComponent());
+var newContextRefComponent = react.registerComponent(() => _NewContextRefComponent());
 
 int calculateChangedBits(currentValue, nextValue) {
-  int result = 1 << 1;
+  var result = 1 << 1;
   if (nextValue['renderCount'] % 2 == 0) {
     result |= 1 << 2;
   }
@@ -276,14 +299,16 @@ var TestNewContext = react.createContext<Map>({'renderCount': 0}, calculateChang
 class _NewContextProviderComponent extends react.Component2 {
   _NewContextRefComponent componentRef;
 
+  @override
   get initialState => {'renderCount': 0, 'complexMap': false};
 
   printMe() {
     print('printMe!');
   }
 
+  @override
   render() {
-    final provideMap = {'renderCount': this.state['renderCount']};
+    final provideMap = {'renderCount': state['renderCount']};
 
     final complexValues = {
       'callback': printMe,
@@ -295,14 +320,14 @@ class _NewContextProviderComponent extends react.Component2 {
       'componentRef': componentRef,
     };
 
-    if (state['complexMap']) {
+    if (state['complexMap'] as bool) {
       provideMap.addAll(complexValues);
     }
 
-    Map newContextRefComponentProps = {
+    final newContextRefComponentProps = {
       'key': 'ref2',
       'ref': (ref) {
-        componentRef = ref;
+        componentRef = ref as _NewContextRefComponent;
       }
     };
 
@@ -323,7 +348,7 @@ class _NewContextProviderComponent extends react.Component2 {
         'onClick': _onComplexClick,
       }, 'Redraw With Complex Value'),
       react.br({'key': 'break1'}),
-      'TestContext.Provider props.value: ${provideMap}',
+      'TestContext.Provider props.value: $provideMap',
       react.br({'key': 'break2'}),
       react.br({'key': 'break3'}),
       TestNewContext.Provider(
@@ -334,23 +359,24 @@ class _NewContextProviderComponent extends react.Component2 {
   }
 
   _onComplexClick(event) {
-    this.setState({'complexMap': true, 'renderCount': this.state['renderCount'] + 1});
+    setState({'complexMap': true, 'renderCount': state['renderCount'] + 1});
   }
 
   _onButtonClick(event) {
-    this.setState({'renderCount': this.state['renderCount'] + 1, 'complexMap': false});
+    setState({'renderCount': state['renderCount'] + 1, 'complexMap': false});
   }
 }
 
-var newContextProviderComponent = react.registerComponent(() => new _NewContextProviderComponent());
+var newContextProviderComponent = react.registerComponent(() => _NewContextProviderComponent());
 
 class _NewContextConsumerComponent extends react.Component2 {
+  @override
   render() {
     return TestNewContext.Consumer({'unstable_observedBits': props['unstable_observedBits']}, (value) {
       return react.ul({
         'key': 'ul1'
       }, [
-        'TestContext.Consumer: value = ${value}',
+        'TestContext.Consumer: value = $value',
         react.br({'key': 'break12'}),
         react.br({'key': 'break22'}),
         props['children'],
@@ -359,15 +385,16 @@ class _NewContextConsumerComponent extends react.Component2 {
   }
 }
 
-var newContextConsumerComponent = react.registerComponent(() => new _NewContextConsumerComponent());
+var newContextConsumerComponent = react.registerComponent(() => _NewContextConsumerComponent());
 
 class _NewContextConsumerObservedBitsComponent extends react.Component2 {
+  @override
   render() {
     return TestNewContext.Consumer({'unstable_observedBits': props['unstable_observedBits']}, (value) {
       return react.ul({
         'key': 'ul2'
       }, [
-        'TestContext.Consumer (with unstable_observedBits set to trigger when `renderCount % 2 == 0`): value = ${value}',
+        'TestContext.Consumer (with unstable_observedBits set to trigger when `renderCount % 2 == 0`): value = $value',
         react.br({'key': 'break13'}),
         react.br({'key': 'break23'}),
         props['children'],
@@ -376,73 +403,79 @@ class _NewContextConsumerObservedBitsComponent extends react.Component2 {
   }
 }
 
-var newContextConsumerObservedBitsComponent =
-    react.registerComponent(() => new _NewContextConsumerObservedBitsComponent());
+var newContextConsumerObservedBitsComponent = react.registerComponent(() => _NewContextConsumerObservedBitsComponent());
 
 class _NewContextTypeConsumerComponent extends react.Component2 {
   @override
   final contextType = TestNewContext;
 
+  @override
   render() {
-    this.context['componentRef']?.test();
+    context['componentRef']?.test();
     return react.ul({
       'key': 'ul3'
     }, [
-      'Using Component.contextType: this.context = ${this.context}',
+      'Using Component.contextType: this.context = $context',
     ]);
   }
 }
 
 class _Component2TestComponent extends react.Component2 with react.TypedSnapshot<String> {
+  @override
   get defaultProps => {'defaultProp': true};
 
+  @override
   get initialState => {'defaultState': true, 'items': []};
 
-  Map getDerivedStateFromProps(nextProps, prevState) {
-    final prevItems = prevState['items'];
+  @override
+  getDerivedStateFromProps(nextProps, prevState) {
+    final prevItems = prevState['items'] as List;
     if (prevItems.isEmpty || prevItems[0] != 3) {
-      return ({
-        'items': new List.from([3, 1, 2, 0])
-      });
+      return {
+        'items': List.from([3, 1, 2, 0])
+      };
     }
     return null;
   }
 
-  String getSnapshotBeforeUpdate(nextProps, prevState) {
-    if (prevState["items"].length > state["items"].length) {
-      return "removed " + prevState["items"].last.toString();
+  @override
+  getSnapshotBeforeUpdate(nextProps, prevState) {
+    if ((prevState['items'] as List).length > (state['items'] as List).length) {
+      return 'removed ' + (prevState['items'].last as List).toString();
     } else {
-      return "added " + state["items"].last.toString();
+      return 'added ' + (state['items'].last as List).toString();
     }
   }
 
-  void componentDidUpdate(prevProps, prevState, [String snapshot]) {
+  @override
+  componentDidUpdate(prevProps, prevState, [String snapshot]) {
     if (snapshot != null) {
-      print('Updated DOM and ' + snapshot);
-      return null;
+      print('Updated DOM and $snapshot');
+      return;
     }
-    print("No Snapshot");
+    print('No Snapshot');
   }
 
   void removeItem(event) {
-    List items = new List.from(state["items"]);
+    final items = List.from(state['items'] as List);
     items.removeAt(items.length - 1);
-    setState({"items": items});
+    setState({'items': items});
   }
 
   void addItem(event) {
-    List items = new List.from(state["items"]);
+    final items = List.from(state['items'] as List);
     items.add(items.length);
-    setState({"items": items});
+    setState({'items': items});
   }
 
-  dynamic render() {
+  @override
+  render() {
     // Used to generate unique keys even when the list contains duplicate items
     final itemCounts = <dynamic, int>{};
     final items = [];
-    for (var item in state['items']) {
+    for (final item in state['items']) {
       final count = itemCounts[item] = (itemCounts[item] ?? 0) + 1;
-      items.add(react.li({'key': 'c2-$item-$count'}, "$item"));
+      items.add(react.li({'key': 'c2-$item-$count'}, '$item'));
     }
 
     return react.div({}, [
@@ -463,25 +496,27 @@ class _Component2TestComponent extends react.Component2 with react.TypedSnapshot
   }
 }
 
-var newContextTypeConsumerComponentComponent = react.registerComponent(() => new _NewContextTypeConsumerComponent());
-var component2TestComponent = react.registerComponent(() => new _Component2TestComponent());
+var newContextTypeConsumerComponentComponent = react.registerComponent(() => _NewContextTypeConsumerComponent());
+var component2TestComponent = react.registerComponent(() => _Component2TestComponent());
 
 class _ErrorComponent extends react.Component2 {
-  void componentDidMount() {
-    if (!props["errored"]) {
-      throw new _CustomException("It broke!", 2);
+  @override
+  componentDidMount() {
+    if (!(props['errored'] as bool)) {
+      throw _CustomException('It broke!', 2);
     }
   }
 
-  dynamic render() {
+  @override
+  render() {
     return react.div(
         {'key': 'eb-d1-e'},
-        "Oh no, I'm an error! Check your "
-        "console.");
+        'Oh no, I\'m an error! Check your '
+        'console.');
   }
 }
 
-var ErrorComponent = react.registerComponent(() => new _ErrorComponent());
+var ErrorComponent = react.registerComponent(() => _ErrorComponent());
 
 class _CustomException implements Exception {
   int code;
@@ -491,76 +526,74 @@ class _CustomException implements Exception {
   _CustomException(this.message, this.code) {
     switch (code) {
       case 1:
-        randomMessage = "The code is a 1";
+        randomMessage = 'The code is a 1';
         break;
       case 2:
-        randomMessage = "The Code is a 2";
+        randomMessage = 'The Code is a 2';
         break;
       default:
-        randomMessage = "Default Error Code";
+        randomMessage = 'Default Error Code';
     }
   }
 }
 
 class _Component2ErrorTestComponent extends react.Component2 {
-  Map get initialState => {
-        "clicked": false,
-        "errored": false,
-        "error": null,
+  @override
+  get initialState => {
+        'clicked': false,
+        'errored': false,
+        'error': null,
       };
 
-  void componentDidCatch(error, info) {
+  @override
+  componentDidCatch(error, info) {
     if (error is _CustomException) {
       print(info.dartStackTrace);
-      setState({"error": error.randomMessage});
+      setState({'error': error.randomMessage});
     } else {
-      setState({
-        "error": "We can capture the error, store it in state and "
-            "display it here."
-      });
+      setState({'error': 'We can capture the error, store it in state and display it here.'});
     }
   }
 
-  Map getDerivedStateFromError(error) {
-    return {"errored": true};
+  @override
+  getDerivedStateFromError(error) {
+    return {'errored': true};
   }
 
   void error(event) {
-    setState({"clicked": true});
+    setState({'clicked': true});
   }
 
   void clearError(event) {
-    setState({"clicked": false, "error": null, "errored": false});
+    setState({'clicked': false, 'error': null, 'errored': false});
   }
 
-  dynamic render() {
-    dynamic errorMessage = state["error"] ?? "No error yet";
+  @override
+  render() {
+    final errorMessage = state['error'] ?? 'No error yet';
 
     return react.div({
-      "key": "e-cont"
+      'key': 'e-cont'
     }, [
-      react.h3({"key": "e-header"}, "Error Boundary Test"),
-      state["clicked"] ? ErrorComponent({'key': 'ec-1', 'errored': state['errored']}) : null,
+      react.h3({'key': 'e-header'}, 'Error Boundary Test'),
+      state['clicked'] as bool ? ErrorComponent({'key': 'ec-1', 'errored': state['errored']}) : null,
       errorMessage != null ? react.div({'key': 'ec-m-1'}, '$errorMessage') : null,
-      !state["errored"]
-          ? react.button({
-              'type': 'button',
-              'key': 'c3-r-button',
-              'className': 'btn btn-primary',
-              'onClick': error,
-            }, 'Trigger Error')
-          : null,
-      state["errored"]
+      state['errored'] as bool
           ? react.button({
               'type': 'button',
               'key': 'c3-c-button',
               'className': 'btn btn-primary',
               'onClick': clearError,
             }, 'Clear Error')
-          : null,
-      react.hr({"key": "e-hr"}),
+          : react.button({
+              'type': 'button',
+              'key': 'c3-r-button',
+              'className': 'btn btn-primary',
+              'onClick': error,
+            }, 'Trigger Error'),
+      react.hr({'key': 'e-hr'}),
     ]);
   }
 }
 
-var component2ErrorTestComponent = react.registerComponent(() => new _Component2ErrorTestComponent(), ['render']);
+var component2ErrorTestComponent = react.registerComponent(() => _Component2ErrorTestComponent(), ['render']);
diff --git a/example/test/ref_test.dart b/example/test/ref_test.dart
index 690c0832..248dd73f 100644
--- a/example/test/ref_test.dart
+++ b/example/test/ref_test.dart
@@ -1,11 +1,11 @@
 // ignore_for_file: deprecated_member_use_from_same_package
-import "dart:html";
+import 'dart:html';
 
-import "package:react/react.dart" as react;
-import "package:react/react_dom.dart" as react_dom;
-import "package:react/react_client.dart";
+import 'package:react/react.dart' as react;
+import 'package:react/react_dom.dart' as react_dom;
+import 'package:react/react_client.dart';
 
-var ChildComponent = react.registerComponent(() => new _ChildComponent());
+var ChildComponent = react.registerComponent(() => _ChildComponent());
 
 class _ChildComponent extends react.Component {
   int somevalue = 10;
@@ -14,7 +14,8 @@ class _ChildComponent extends react.Component {
     redraw();
   }
 
-  render() => react.span({}, "Child element with value ${somevalue}");
+  @override
+  render() => react.span({}, 'Child element with value $somevalue');
 }
 
 var InputComponentForm = react.forwardRef2((props, ref) {
@@ -39,14 +40,14 @@ var InputComponentForm = react.forwardRef2((props, ref) {
 
 var ChildComponentForm = react.forwardRef2((props, ref) {
   return react.Fragment({}, [
-    react.h4({'key': 'create-child-h4'}, "ChildComponent"),
+    react.h4({'key': 'create-child-h4'}, 'ChildComponent'),
     react.form({
       'key': 'childComponentForm',
       'className': 'form-inline'
     }, [
       ChildComponent({
         'key': 'create-child',
-        "ref": ref,
+        'ref': ref,
       }),
       '\u00a0',
       react.button({
@@ -66,28 +67,28 @@ var ChildComponentForm = react.forwardRef2((props, ref) {
   ]);
 }, displayName: 'ChildComponentForm');
 
-var ParentComponent = react.registerComponent(() => new _ParentComponent());
+var ParentComponent = react.registerComponent(() => _ParentComponent());
 
 class _ParentComponent extends react.Component {
   // String refs
   showInputValue(_) {
-    var input = react_dom.findDOMNode(ref('inputRef')) as InputElement;
+    final input = react_dom.findDOMNode(ref('inputRef')) as InputElement;
     print(input.value);
   }
 
   showChildValue(_) {
-    print(ref("childRef").somevalue);
+    print(ref('childRef').somevalue);
   }
 
   incrementChildValue(_) {
-    ref("childRef").incrementValue();
+    ref('childRef').incrementValue();
   }
 
   // Callback refs
   InputElement _inputCallbackRef;
   _ChildComponent _childCallbackRef;
   showInputCallbackRefValue(_) {
-    var input = react_dom.findDOMNode(_inputCallbackRef);
+    final input = react_dom.findDOMNode(_inputCallbackRef) as InputElement;
     print(input.value);
   }
 
@@ -104,7 +105,7 @@ class _ParentComponent extends react.Component {
   final Ref<_ChildComponent> _childCreateRef = react.createRef();
 
   showInputCreateRefValue(_) {
-    var input = react_dom.findDOMNode(_inputCreateRef.current);
+    final input = react_dom.findDOMNode(_inputCreateRef.current) as InputElement;
     print(input.value);
   }
 
@@ -116,13 +117,14 @@ class _ParentComponent extends react.Component {
     _childCreateRef.current.incrementValue();
   }
 
+  @override
   render() => react.div({}, [
         react.h1({'key': 'h1'}, 'Refs'),
         react.div({
           'key': 'string-refs'
         }, [
-          react.h2({'key': 'string-h2'}, "String refs"),
-          react.h4({'key': 'string-h4'}, "<input>"),
+          react.h2({'key': 'string-h2'}, 'String refs'),
+          react.h4({'key': 'string-h4'}, '<input>'),
           react.form({
             'key': 'stringRefInputForm',
             'className': 'form-inline'
@@ -140,12 +142,12 @@ class _ParentComponent extends react.Component {
               'onClick': showInputValue,
             }, 'Print input element value'),
           ]),
-          react.h4({'key': 'string-h4-child'}, "ChildComponent"),
+          react.h4({'key': 'string-h4-child'}, 'ChildComponent'),
           react.form({
             'key': 'stringRefChildComponentForm',
             'className': 'form-inline'
           }, [
-            ChildComponent({'key': 'string-child', "ref": "childRef"}),
+            ChildComponent({'key': 'string-child', 'ref': 'childRef'}),
             '\u00a0',
             react.button({
               'type': 'button',
@@ -165,8 +167,8 @@ class _ParentComponent extends react.Component {
         react.div({
           'key': 'callback-refs'
         }, [
-          react.h2({'key': 'h2-callback'}, "Callback refs"),
-          react.h4({'key': 'h4-callback-input'}, "<input>"),
+          react.h2({'key': 'h2-callback'}, 'Callback refs'),
+          react.h4({'key': 'h4-callback-input'}, '<input>'),
           react.form({
             'key': 'inputForm',
             'className': 'form-inline'
@@ -174,7 +176,7 @@ class _ParentComponent extends react.Component {
             react.input({
               'key': 'callback-input',
               'className': 'form-control',
-              'ref': (instance) => _inputCallbackRef = instance,
+              'ref': (instance) => _inputCallbackRef = instance as InputElement,
             }),
             '\u00a0',
             react.button({
@@ -184,14 +186,14 @@ class _ParentComponent extends react.Component {
               'onClick': showInputCallbackRefValue,
             }, 'Print input element value'),
           ]),
-          react.h4({'key': 'callback-child-h4'}, "ChildComponent"),
+          react.h4({'key': 'callback-child-h4'}, 'ChildComponent'),
           react.form({
             'key': 'childComponentForm',
             'className': 'form-inline'
           }, [
             ChildComponent({
               'key': 'callback-child',
-              "ref": (instance) => _childCallbackRef = instance,
+              'ref': (instance) => _childCallbackRef = instance as _ChildComponent,
             }),
             '\u00a0',
             react.button({
@@ -212,8 +214,8 @@ class _ParentComponent extends react.Component {
         react.div({
           'key': 'forward-refs'
         }, [
-          react.h2({'key': 'h2-forward'}, "Create / Forward refs"),
-          react.h4({'key': 'h4-forward-input'}, "<input>"),
+          react.h2({'key': 'h2-forward'}, 'Create / Forward refs'),
+          react.h4({'key': 'h4-forward-input'}, '<input>'),
           InputComponentForm({
             'ref': _inputCreateRef,
             'showInputForwardRefValue': showInputCreateRefValue,
@@ -231,6 +233,6 @@ class _ParentComponent extends react.Component {
 
 var mountedNode = querySelector('#content');
 void main() {
-  var component = ParentComponent({});
+  final component = ParentComponent({});
   react_dom.render(component, mountedNode);
 }
diff --git a/example/test/speed_test.dart b/example/test/speed_test.dart
index d887c484..057e5a93 100644
--- a/example/test/speed_test.dart
+++ b/example/test/speed_test.dart
@@ -1,43 +1,48 @@
 // ignore_for_file: deprecated_member_use_from_same_package
-import "dart:html";
-import "dart:async";
+import 'dart:html';
+import 'dart:async';
 
-import "package:react/react.dart" as react;
-import "package:react/react_dom.dart" as react_dom;
+import 'package:react/react.dart' as react;
+import 'package:react/react_dom.dart' as react_dom;
 
-Stopwatch stopwatch = new Stopwatch()..start();
+Stopwatch stopwatch = Stopwatch()..start();
 timeprint(message) {
-  print("$message ${stopwatch.elapsedMilliseconds}");
+  print('$message ${stopwatch.elapsedMilliseconds}');
   stopwatch.reset();
 }
 
 class _Div extends react.Component {
+  @override
   shouldComponentUpdate(nProps, nState) {
     return nProps['key'] != props['key'];
   }
 
+  @override
   render() {
     return react.div(props, props['children']);
   }
 }
 
-var Div = react.registerComponent(() => new _Div());
+var Div = react.registerComponent(() => _Div());
 
 class _Span extends react.Component {
+  @override
   shouldComponentUpdate(nProps, nState) {
     return nProps['children'][0] != props['children'][0];
   }
 
+  @override
   render() {
     return react.span(props, props['children']);
   }
 }
 
-var Span = react.registerComponent(() => new _Span());
+var Span = react.registerComponent(() => _Span());
 
 class _Hello extends react.Component {
+  @override
   componentWillMount() {
-    new Future.delayed(new Duration(seconds: 5), () {
+    Future.delayed(Duration(seconds: 5), () {
       stopwatch.reset();
       timeprint('before redraw call');
       redraw();
@@ -45,16 +50,17 @@ class _Hello extends react.Component {
     });
   }
 
+  @override
   render() {
-    timeprint("rendering start");
-    var data = props['data'];
-    var children = [];
-    for (var elem in data) {
+    timeprint('rendering start');
+    final data = props['data'];
+    final children = [];
+    for (final elem in data) {
       children.add(react.div({
         'key': elem[0]
       }, [
         react.span({'key': 'span1'}, elem[0]),
-        " ",
+        ' ',
         react.span({'key': 'span2'}, elem[1])
       ]));
     }
@@ -65,19 +71,19 @@ class _Hello extends react.Component {
 //          react.span({}, elem[1])
 //        ]))
 //    );
-    timeprint("rendering almost ends");
-    var res = react.div({}, children);
-    timeprint("rendering ends");
+    timeprint('rendering almost ends');
+    final res = react.div({}, children);
+    timeprint('rendering ends');
     return res;
   }
 }
 
-var Hello = react.registerComponent(() => new _Hello());
+var Hello = react.registerComponent(() => _Hello());
 
 void main() {
-  var data = [];
+  final data = [];
   for (num i = 0; i < 1000; i++) {
-    data.add(["name_$i", "value_$i"]);
+    data.add(['name_$i', 'value_$i']);
   }
-  react_dom.render(Hello({"data": data}, []), querySelector('#content'));
+  react_dom.render(Hello({'data': data}, []), querySelector('#content'));
 }
diff --git a/example/test/unmount_test.dart b/example/test/unmount_test.dart
index 1cb4b1d5..2cb484a2 100644
--- a/example/test/unmount_test.dart
+++ b/example/test/unmount_test.dart
@@ -1,24 +1,27 @@
 // ignore_for_file: deprecated_member_use_from_same_package
-import "dart:html";
+import 'dart:html';
 
-import "package:react/react.dart" as react;
-import "package:react/react_dom.dart" as react_dom;
+import 'package:react/react.dart' as react;
+import 'package:react/react_dom.dart' as react_dom;
 
-var simpleComponent = react.registerComponent(() => new SimpleComponent());
+var simpleComponent = react.registerComponent(() => SimpleComponent());
 
 class SimpleComponent extends react.Component {
-  componentWillMount() => print("mount");
+  @override
+  componentWillMount() => print('mount');
 
-  componentWillUnmount() => print("unmount");
+  @override
+  componentWillUnmount() => print('unmount');
 
+  @override
   render() => react.div({}, [
-        "Simple component",
+        'Simple component',
       ]);
 }
 
 void main() {
-  print("What");
-  var mountedNode = querySelector('#content');
+  print('What');
+  final mountedNode = querySelector('#content');
 
   querySelector('#mount').onClick.listen((_) => react_dom.render(simpleComponent({}), mountedNode));
 
diff --git a/lib/hooks.dart b/lib/hooks.dart
index 9fe1df67..c83348f5 100644
--- a/lib/hooks.dart
+++ b/lib/hooks.dart
@@ -25,18 +25,18 @@ class StateHook<T> {
 
   StateHook(T initialValue) {
     final result = React.useState(initialValue);
-    _value = result[0];
-    _setValue = result[1];
+    _value = result[0] as T;
+    _setValue = result[1] as void Function(dynamic);
   }
 
   /// Constructor for [useStateLazy], calls lazy version of [React.useState] to
   /// initialize [_value] to the return value of [init].
   ///
   /// See: <https://reactjs.org/docs/hooks-reference.html#lazy-initial-state>.
-  StateHook.lazy(T init()) {
+  StateHook.lazy(T Function() init) {
     final result = React.useState(allowInterop(init));
-    _value = result[0];
-    _setValue = result[1];
+    _value = result[0] as T;
+    _setValue = result[1] as void Function(dynamic);
   }
 
   /// The current value of the state.
@@ -52,7 +52,7 @@ class StateHook<T> {
   /// Updates [value] to the return value of [computeNewValue].
   ///
   /// See: <https://reactjs.org/docs/hooks-reference.html#functional-updates>.
-  void setWithUpdater(T computeNewValue(T oldValue)) => _setValue(allowInterop(computeNewValue));
+  void setWithUpdater(T Function(T oldValue) computeNewValue) => _setValue(allowInterop(computeNewValue));
 }
 
 /// Adds local state to a [DartFunctionComponent]
@@ -100,7 +100,7 @@ StateHook<T> useState<T>(T initialValue) => StateHook(initialValue);
 /// ```
 ///
 /// Learn more: <https://reactjs.org/docs/hooks-reference.html#lazy-initial-state>.
-StateHook<T> useStateLazy<T>(T init()) => StateHook.lazy(init);
+StateHook<T> useStateLazy<T>(T Function() init) => StateHook.lazy(init);
 
 /// Runs [sideEffect] after every completed render of a [DartFunctionComponent].
 ///
@@ -141,8 +141,8 @@ StateHook<T> useStateLazy<T>(T init()) => StateHook.lazy(init);
 ///
 /// See: <https://reactjs.org/docs/hooks-effect.html#tip-optimizing-performance-by-skipping-effects>.
 void useEffect(dynamic Function() sideEffect, [List<Object> dependencies]) {
-  var wrappedSideEffect = allowInterop(() {
-    var result = sideEffect();
+  final wrappedSideEffect = allowInterop(() {
+    final result = sideEffect();
     if (result is Function) {
       return allowInterop(result);
     }
@@ -165,16 +165,16 @@ void useEffect(dynamic Function() sideEffect, [List<Object> dependencies]) {
 ///
 /// Learn more: <https://reactjs.org/docs/hooks-reference.html#usereducer>.
 class ReducerHook<TState, TAction, TInit> {
-  /// The first item of the pair returned by [React.userReducer].
+  /// The first item of the pair returned by [React.useReducer].
   TState _state;
 
-  /// The second item in the pair returned by [React.userReducer].
+  /// The second item in the pair returned by [React.useReducer].
   void Function(TAction) _dispatch;
 
   ReducerHook(TState Function(TState state, TAction action) reducer, TState initialState) {
     final result = React.useReducer(allowInterop(reducer), initialState);
-    _state = result[0];
-    _dispatch = result[1];
+    _state = result[0] as TState;
+    _dispatch = result[1] as void Function(TAction);
   }
 
   /// Constructor for [useReducerLazy], calls lazy version of [React.useReducer] to
@@ -184,8 +184,8 @@ class ReducerHook<TState, TAction, TInit> {
   ReducerHook.lazy(
       TState Function(TState state, TAction action) reducer, TInit initialArg, TState Function(TInit) init) {
     final result = React.useReducer(allowInterop(reducer), initialArg, allowInterop(init));
-    _state = result[0];
-    _dispatch = result[1];
+    _state = result[0] as TState;
+    _dispatch = result[1] as void Function(TAction);
   }
 
   /// The current state map of the component.
@@ -201,7 +201,7 @@ class ReducerHook<TState, TAction, TInit> {
   void dispatch(TAction action) => _dispatch(action);
 }
 
-/// Initializes state of a [DartFunctionComponent] to [initialState] and creates [dispatch] method.
+/// Initializes state of a [DartFunctionComponent] to [initialState] and creates a `dispatch` method.
 ///
 /// __Example__:
 ///
@@ -241,7 +241,7 @@ ReducerHook<TState, TAction, TInit> useReducer<TState, TAction, TInit>(
         TState Function(TState state, TAction action) reducer, TState initialState) =>
     ReducerHook(reducer, initialState);
 
-/// Initializes state of a [DartFunctionComponent] to [init(initialArg)] and creates [dispatch] method.
+/// Initializes state of a [DartFunctionComponent] to `init(initialArg)` and creates `dispatch` method.
 ///
 /// __Example__:
 ///
@@ -328,7 +328,7 @@ ReducerHook<TState, TAction, TInit> useReducerLazy<TState, TAction, TInit>(
 ///
 /// Learn more: <https://reactjs.org/docs/hooks-reference.html#usecallback>.
 T useCallback<T extends Function>(T callback, List dependencies) =>
-    React.useCallback(allowInterop(callback), dependencies);
+    React.useCallback(allowInterop(callback), dependencies) as T;
 
 /// Returns the value of the nearest [Context.Provider] for the provided [context] object every time that context is
 /// updated.
@@ -426,7 +426,7 @@ Ref<T> useRef<T>([T initialValue]) => Ref.useRefInit(initialValue);
 ///
 /// Learn more: <https://reactjs.org/docs/hooks-reference.html#usememo>.
 T useMemo<T>(T Function() createFunction, [List<dynamic> dependencies]) =>
-    React.useMemo(allowInterop(createFunction), dependencies);
+    React.useMemo(allowInterop(createFunction), dependencies) as T;
 
 /// Runs [sideEffect] synchronously after a [DartFunctionComponent] renders, but before the screen is updated.
 ///
@@ -581,7 +581,7 @@ void useImperativeHandle(dynamic ref, dynamic Function() createHandle, [List<dyn
 ///   return isOnline;
 /// }
 ///
-/// final FriendListItem = react.registerFunctionComponent((Map props) {
+/// final FriendListItem = react.registerFunctionComponent((props) {
 ///   final isOnline = useFriendStatus(props['friend']['id']);
 ///
 ///   return react.li({
diff --git a/lib/react.dart b/lib/react.dart
index 60b1889f..2324e01c 100644
--- a/lib/react.dart
+++ b/lib/react.dart
@@ -14,7 +14,6 @@ import 'package:react/src/prop_validator.dart';
 import 'package:react/src/typedefs.dart';
 import 'package:react/react_client.dart';
 import 'package:react/react_client/react_interop.dart';
-import 'package:react/react_client/component_factory.dart';
 import 'package:react/src/context.dart';
 import 'package:react/src/react_client/component_registration.dart' as registration_utils;
 import 'package:react/src/react_client/private_utils.dart' show validateJsApiThenReturn;
@@ -27,11 +26,11 @@ export 'package:react/src/react_client/synthetic_event_wrappers.dart' hide NonNa
 export 'package:react/src/react_client/synthetic_data_transfer.dart' show SyntheticDataTransfer;
 export 'package:react/src/react_client/event_helpers.dart';
 
-typedef Error PropValidator<TProps>(TProps props, PropValidatorInfo info);
+typedef PropValidator<TProps> = Error Function(TProps props, PropValidatorInfo info);
 
 /// A React component declared using a function that takes in [props] and returns rendered output.
 ///
-/// See <https://facebook.github.io/react/docs/components-and-props.html#functional-and-class-components>.
+/// See <https://reactjs.org/docs/components-and-props.html#function-and-class-components>.
 ///
 /// [props] is typed as [JsBackedMap] so that dart2js can optimize props accesses.
 typedef DartFunctionComponent = dynamic Function(JsBackedMap props);
@@ -45,19 +44,19 @@ typedef DartFunctionComponent = dynamic Function(JsBackedMap props);
 /// and not just a ref object, so we type [ref] as dynamic here.
 typedef DartForwardRefFunctionComponent = dynamic Function(JsBackedMap props, dynamic ref);
 
-typedef T ComponentFactory<T extends Component>();
+typedef ComponentFactory<T extends Component> = T Function();
 
-typedef ReactComponentFactoryProxy ComponentRegistrar(ComponentFactory componentFactory,
+typedef ComponentRegistrar = ReactComponentFactoryProxy Function(ComponentFactory componentFactory,
     [Iterable<String> skipMethods]);
 
-typedef ReactDartComponentFactoryProxy2 ComponentRegistrar2(
+typedef ComponentRegistrar2 = ReactDartComponentFactoryProxy2 Function(
   ComponentFactory<Component2> componentFactory, {
   Iterable<String> skipMethods,
   Component2BridgeFactory bridgeFactory,
 });
 
-typedef ReactDartFunctionComponentFactoryProxy FunctionComponentRegistrar(DartFunctionComponent componentFactory,
-    {String displayName});
+typedef FunctionComponentRegistrar = ReactDartFunctionComponentFactoryProxy
+    Function(DartFunctionComponent componentFactory, {String displayName});
 
 /// Fragment component that allows the wrapping of children without the necessity of using
 /// an element that adds an additional layer to the DOM (div, span, etc).
@@ -67,7 +66,7 @@ var Fragment = ReactJsComponentFactoryProxy(React.Fragment);
 
 /// [Suspense] lets you display a fallback UI until its children have finished loading.
 ///
-/// Like [react.Fragment], [Suspense] does not render any visible UI.
+/// Like [Fragment], [Suspense] does not render any visible UI.
 /// It lets you specify a loading indicator in case some components in
 /// the tree below it are not yet ready to render.
 /// [Suspense] currently works with:
@@ -104,8 +103,8 @@ var Suspense = ReactJsComponentFactoryProxy(React.Suspense);
 /// See: <https://reactjs.org/docs/strict-mode.html>
 var StrictMode = ReactJsComponentFactoryProxy(React.StrictMode);
 
-/// Top-level ReactJS [Component class](https://facebook.github.io/react/docs/react-component.html)
-/// which provides the [ReactJS Component API](https://facebook.github.io/react/docs/react-component.html#reference)
+/// Top-level ReactJS [Component class](https://reactjs.org/docs/react-component.html)
+/// which provides the [ReactJS Component API](https://reactjs.org/docs/react-component.html#reference)
 ///
 /// __Deprecated. Use [Component2] instead.__
 @Deprecated('7.0.0')
@@ -155,17 +154,19 @@ abstract class Component {
   /// >
   /// > It is strongly recommended that you migrate to [Component2] and use [Component2.context] instead.
   @experimental
-  set context(dynamic value) => _context = value;
+  set context(dynamic value) => _context = value as Map;
 
   /// ReactJS [Component] props.
   ///
   /// Related: [state]
+  // ignore: unnecessary_getters_setters
   Map get props => _props;
   set props(Map value) => _props = value;
 
   /// ReactJS [Component] state.
   ///
   /// Related: [props]
+  // ignore: unnecessary_getters_setters
   Map get state => _state;
   set state(Map value) => _state = value;
 
@@ -195,8 +196,10 @@ abstract class Component {
 
   dynamic _jsThis;
 
+  // ignore: prefer_final_fields
   List<SetStateCallback> _setStateCallbacks = [];
 
+  // ignore: prefer_final_fields
   List<StateUpdaterCallback> _transactionalSetStateCallbacks = [];
 
   /// The List of callbacks to be called after the component has been updated from a call to [setState].
@@ -205,11 +208,11 @@ abstract class Component {
   /// The List of transactional `setState` callbacks to be called before the component updates.
   List get transactionalSetStateCallbacks => _transactionalSetStateCallbacks;
 
-  /// The JavaScript [`ReactComponent`](https://facebook.github.io/react/docs/top-level-api.html#reactdom.render)
+  /// The JavaScript [`ReactComponent`](https://reactjs.org/docs/react-api.html#reactdom.render)
   /// instance of this `Component` returned by [render].
   dynamic get jsThis => _jsThis;
 
-  /// Allows the [ReactJS `displayName` property](https://facebook.github.io/react/docs/react-component.html#displayname)
+  /// Allows the [ReactJS `displayName` property](https://reactjs.org/docs/react-component.html#displayname)
   /// to be set for debugging purposes.
   String get displayName => runtimeType.toString();
 
@@ -226,21 +229,21 @@ abstract class Component {
     /// [context]s typing was loosened from Map to dynamic to support the new context API in [Component2]
     /// which extends from [Component]. Only "legacy" context APIs are supported in [Component] - which means
     /// it will still be expected to be a Map.
-    this.context = new Map.from(context ?? const {});
+    this.context = Map.from(context as Map ?? const {});
 
     /// [nextContext]s typing was loosened from Map to dynamic to support the new context API in [Component2]
     /// which extends from [Component]. Only "legacy" context APIs are supported in [Component] - which means
     /// it will still be expected to be a Map.
-    this.nextContext = new Map.from(this.context ?? const {});
+    nextContext = Map.from(this.context as Map ?? const {});
   }
 
   _initProps(props) {
-    this.props = new Map.from(props);
-    this.nextProps = this.props;
+    this.props = Map.from(props as Map);
+    nextProps = this.props;
   }
 
   initStateInternal() {
-    this.state = new Map.from(getInitialState());
+    state = Map.from(getInitialState());
 
     // Call `transferComponentState` to get state also to `_prevState`
     transferComponentState();
@@ -289,7 +292,7 @@ abstract class Component {
   /// Public getter for [_nextState].
   ///
   /// If `null`, then [_nextState] is equal to [state] - which is the value that will be returned.
-  Map get nextState => _nextState == null ? state : _nextState;
+  Map get nextState => _nextState ?? state;
 
   /// Reference to the value of [props] for the upcoming render cycle.
   ///
@@ -312,13 +315,13 @@ abstract class Component {
     if (_nextState != null) {
       state = _nextState;
     }
-    _nextState = new Map.from(state);
+    _nextState = Map.from(state);
   }
 
   /// Force a call to [render] by calling [setState], which effectively "redraws" the `Component`.
   ///
   /// Optionally accepts a [callback] that gets called after the component updates.
-  void redraw([callback()]) {
+  void redraw([Function() callback]) {
     setState({}, callback);
   }
 
@@ -328,14 +331,14 @@ abstract class Component {
   ///
   /// Also allows [newState] to be used as a transactional `setState` callback.
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#setstate>
-  void setState(covariant dynamic newState, [callback()]) {
+  /// See: <https://reactjs.org/docs/react-component.html#setstate>
+  void setState(covariant dynamic newState, [Function() callback]) {
     if (newState is Map) {
       _nextState.addAll(newState);
     } else if (newState is StateUpdaterCallback) {
       _transactionalSetStateCallbacks.add(newState);
     } else if (newState != null) {
-      throw new ArgumentError(
+      throw ArgumentError(
           'setState expects its first parameter to either be a Map or a `TransactionalSetStateCallback`.');
     }
 
@@ -348,14 +351,14 @@ abstract class Component {
   ///
   /// Optionally accepts a callback that gets called after the component updates.
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#setstate>
+  /// See: <https://reactjs.org/docs/react-component.html#setstate>
   ///
   /// > __DEPRECATED.__
   /// >
   /// > Use [setState] instead.
   @Deprecated('7.0.0')
-  void replaceState(Map newState, [callback()]) {
-    Map nextState = newState == null ? {} : new Map.from(newState);
+  void replaceState(Map newState, [Function() callback]) {
+    final nextState = newState == null ? {} : Map.from(newState);
     _nextState = nextState;
     if (callback != null) _setStateCallbacks.add(callback);
 
@@ -368,17 +371,17 @@ abstract class Component {
   /// If you call [setState] within this method, [render] will see the updated state and will be executed only once
   /// despite the [state] value change.
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#mounting-componentwillmount>
+  /// See: <https://reactjs.org/docs/react-component.html#mounting-componentwillmount>
   void componentWillMount() {}
 
   /// ReactJS lifecycle method that is invoked once, only on the client _(not on the server)_, immediately after the
   /// initial rendering occurs.
   ///
-  /// At this point in the lifecycle, you can access any [ref]s to the children of [rootNode].
+  /// At this point in the lifecycle, you can access any [ref]s to the children of the root node.
   ///
   /// The [componentDidMount] method of child `Component`s is invoked _before_ that of parent `Component`.
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#mounting-componentdidmount>
+  /// See: <https://reactjs.org/docs/react-component.html#mounting-componentdidmount>
   void componentDidMount() {}
 
   /// ReactJS lifecycle method that is invoked when a `Component` is receiving [newProps].
@@ -390,7 +393,7 @@ abstract class Component {
   ///
   /// Calling [setState] within this function will not trigger an additional [render].
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#updating-componentwillreceiveprops>
+  /// See: <https://reactjs.org/docs/react-component.html#updating-componentwillreceiveprops>
   /// > __UNSUPPORTED IN COMPONENT2__
   /// >
   /// > This will be removed once 7.0.0 releases; switching to [Component2.getDerivedStateFromProps] is the path forward.
@@ -411,7 +414,7 @@ abstract class Component {
   /// Use this as an opportunity to return `false` when you're certain that the transition to the new props and state
   /// will not require a component update.
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#updating-shouldcomponentupdate>
+  /// See: <https://reactjs.org/docs/react-component.html#updating-shouldcomponentupdate>
   bool shouldComponentUpdate(Map nextProps, Map nextState) => true;
 
   /// > __DEPRECATED - DO NOT USE__
@@ -421,6 +424,7 @@ abstract class Component {
   /// >
   /// > This will be completely removed when the JS side of it is slated for removal (ReactJS 18 / react.dart 7.0.0)
   @Deprecated('7.0.0')
+  // ignore: avoid_returning_null
   bool shouldComponentUpdateWithContext(Map nextProps, Map nextState, Map nextContext) => null;
 
   /// ReactJS lifecycle method that is invoked immediately before rendering when [nextProps] or [nextState] are being
@@ -433,7 +437,7 @@ abstract class Component {
   /// __Note__: Choose either this method or [componentWillUpdateWithContext]. They are both called at the same time so
   /// using both provides no added benefit.
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#updating-componentwillupdate>
+  /// See: <https://reactjs.org/docs/react-component.html#updating-componentwillupdate>
   ///
   /// > __UNSUPPORTED IN COMPONENT2__
   /// >
@@ -459,18 +463,18 @@ abstract class Component {
   ///
   /// This method is not called for the initial [render].
   ///
-  /// Use this as an opportunity to operate on the [rootNode] (DOM) when the `Component` has been updated as a result
+  /// Use this as an opportunity to operate on the root node (DOM) when the `Component` has been updated as a result
   /// of the values of [prevProps] / [prevState].
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#updating-componentdidupdate>
+  /// See: <https://reactjs.org/docs/react-component.html#updating-componentdidupdate>
   void componentDidUpdate(Map prevProps, Map prevState) {}
 
   /// ReactJS lifecycle method that is invoked immediately before a `Component` is unmounted from the DOM.
   ///
-  /// Perform any necessary cleanup in this method, such as invalidating timers or cleaning up any DOM [Element]s that
+  /// Perform any necessary cleanup in this method, such as invalidating timers or cleaning up any DOM `Element`s that
   /// were created in [componentDidMount].
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#unmounting-componentwillunmount>
+  /// See: <https://reactjs.org/docs/react-component.html#unmounting-componentwillunmount>
   void componentWillUnmount() {}
 
   /// Returns a Map of context to be passed to descendant components.
@@ -514,25 +518,25 @@ abstract class Component {
 
   /// Invoked once before the `Component` is mounted. The return value will be used as the initial value of [state].
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#getinitialstate>
+  /// See: <https://reactjs.org/docs/react-component.html#getinitialstate>
   Map getInitialState() => {};
 
-  /// Invoked once and cached when [reactComponentClass] is called. Values in the mapping will be set on [props]
+  /// Invoked once and cached when [registerComponent] is called. Values in the mapping will be set on [props]
   /// if that prop is not specified by the parent component.
   ///
   /// This method is invoked before any instances are created and thus cannot rely on [props]. In addition, be aware
   /// that any complex objects returned by `getDefaultProps` will be shared across instances, not copied.
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#getdefaultprops>
+  /// See: <https://reactjs.org/docs/react-component.html#getdefaultprops>
   Map getDefaultProps() => {};
 
   /// __Required.__
   ///
-  /// When called, it should examine [props] and [state] and return a single child [Element]. This child [Element] can
-  /// be either a virtual representation of a native DOM component (such as [DivElement]) or another composite
+  /// When called, it should examine [props] and [state] and return a single child `Element`. This child `Element` can
+  /// be either a virtual representation of a native DOM component (such as `DivElement`) or another composite
   /// `Component` that you've defined yourself.
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#render>
+  /// See: <https://reactjs.org/docs/react-component.html#render>
   dynamic render();
 }
 
@@ -564,7 +568,7 @@ abstract class Component {
 /// 4. Supports React 16 [context]
 abstract class Component2 implements Component {
   /// Accessed once and cached when instance is created. The [contextType] property on a class can be assigned
-  /// a [ReactDartContext] object created by [React.createContext]. This lets you consume the nearest current value of
+  /// a [ReactContext] object created by [React.createContext]. This lets you consume the nearest current value of
   /// that Context using [context].
   ///
   /// __Example__:
@@ -585,7 +589,7 @@ abstract class Component2 implements Component {
   /// See: <https://reactjs.org/docs/context.html#classcontexttype>
   Context get contextType => null;
 
-  /// Invoked once and cached when [reactComponentClass] is called. Values in the mapping will be set on [props]
+  /// Invoked once and cached when [registerComponent] is called. Values in the mapping will be set on [props]
   /// if that prop is not specified by the parent component.
   ///
   /// This method is invoked before any instances are created and thus cannot rely on [props]. In addition, be aware
@@ -664,12 +668,12 @@ abstract class Component2 implements Component {
   @Deprecated('7.0.0')
   set _jsThis(_) => throw _unsupportedError('_jsThis');
 
-  /// The JavaScript [`ReactComponent`](https://facebook.github.io/react/docs/top-level-api.html#reactdom.render)
+  /// The JavaScript [`ReactComponent`](https://reactjs.org/docs/react-api.html#reactdom.render)
   /// instance of this `Component` returned by [render].
   @override
   ReactComponent jsThis;
 
-  /// Allows the [ReactJS `displayName` property](https://facebook.github.io/react/docs/react-component.html#displayname)
+  /// Allows the [ReactJS `displayName` property](https://reactjs.org/docs/react-component.html#displayname)
   /// to be set for debugging purposes.
   ///
   /// In DDC, this will be the class name, but in dart2js it will be null unless
@@ -677,8 +681,9 @@ abstract class Component2 implements Component {
   ///
   /// This will result in the dart2js name being `ReactDartComponent2` (the
   /// name of the proxying JS component defined in _dart_helpers.js).
+  @override
   String get displayName {
-    var value;
+    String value;
     assert(() {
       value = runtimeType.toString();
       return true;
@@ -695,6 +700,7 @@ abstract class Component2 implements Component {
   /// To use a transactional `setState` callback, check out [setStateWithUpdater].
   ///
   /// See: <https://reactjs.org/docs/react-component.html#setstate>
+  @override
   void setState(Map newState, [SetStateCallback callback]) {
     _bridge.setState(this, newState, callback);
   }
@@ -719,11 +725,12 @@ abstract class Component2 implements Component {
   /// ReactJS lifecycle method that is invoked once, only on the client _(not on the server)_, immediately after the
   /// initial rendering occurs.
   ///
-  /// At this point in the lifecycle, you can access any [ref]s to the children of [rootNode].
+  /// At this point in the lifecycle, you can access any [ref]s to the children of the root node.
   ///
   /// The [componentDidMount] method of child `Component`s is invoked _before_ that of parent `Component`.
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#mounting-componentdidmount>
+  /// See: <https://reactjs.org/docs/react-component.html#mounting-componentdidmount>
+  @override
   void componentDidMount() {}
 
   /// ReactJS lifecycle method that is invoked before rendering when new props ([nextProps]) are received.
@@ -771,6 +778,7 @@ abstract class Component2 implements Component {
   /// will not require a component update.
   ///
   /// See: <https://reactjs.org/docs/react-component.html#shouldcomponentupdate>
+  @override
   bool shouldComponentUpdate(Map nextProps, Map nextState) => true;
 
   /// ReactJS lifecycle method that is invoked immediately after re-rendering
@@ -819,7 +827,7 @@ abstract class Component2 implements Component {
   ///
   /// This method is not called for the initial [render].
   ///
-  /// Use this as an opportunity to operate on the [rootNode] (DOM) when the `Component` has been updated as a result
+  /// Use this as an opportunity to operate on the root node (DOM) when the `Component` has been updated as a result
   /// of the values of [prevProps] / [prevState].
   ///
   /// __Note__: React 16 added a third parameter to `componentDidUpdate`, which
@@ -828,14 +836,16 @@ abstract class Component2 implements Component {
   /// parameter in `componentDidUpdate` will be null.
   ///
   /// See: <https://reactjs.org/docs/react-component.html#componentdidupdate>
+  @override
   void componentDidUpdate(Map prevProps, Map prevState, [dynamic snapshot]) {}
 
   /// ReactJS lifecycle method that is invoked immediately before a `Component` is unmounted from the DOM.
   ///
-  /// Perform any necessary cleanup in this method, such as invalidating timers or cleaning up any DOM [Element]s that
+  /// Perform any necessary cleanup in this method, such as invalidating timers or cleaning up any DOM `Element`s that
   /// were created in [componentDidMount].
   ///
   /// See: <https://reactjs.org/docs/react-component.html#componentwillunmount>
+  @override
   void componentWillUnmount() {}
 
   /// ReactJS lifecycle method that is invoked after an [error] is thrown by a descendant.
@@ -910,6 +920,7 @@ abstract class Component2 implements Component {
   /// ```
   ///
   /// See: <https://reactjs.org/docs/typechecking-with-proptypes.html#proptypes>
+  // ignore: prefer_void_to_null
   Map<String, PropValidator<Null>> get propTypes => {};
 
   /// Examines [props] and [state] and returns one of the following types:
@@ -930,6 +941,7 @@ abstract class Component2 implements Component {
   /// or the other lifecycle methods instead. Keeping `render` pure makes components easier to think about.
   ///
   /// See: <https://reactjs.org/docs/react-component.html#render>
+  @override
   dynamic render();
 
   // ******************************************************************************************************************
@@ -961,31 +973,33 @@ abstract class Component2 implements Component {
   // ******************************************************************************************************************
 
   UnsupportedError _unsupportedLifecycleError(String memberName) =>
-      new UnsupportedError('Component2 drops support for the lifecycle method $memberName.'
+      UnsupportedError('Component2 drops support for the lifecycle method $memberName.'
           ' See doc comment on Component2.$memberName for migration instructions.');
 
   /// Invoked once before the `Component` is mounted. The return value will be used as the initial value of [state].
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#getinitialstate>
+  /// See: <https://reactjs.org/docs/react-component.html#getinitialstate>
   ///
   /// > __DEPRECATED - DO NOT USE__
   /// >
   /// > Use the [initialState] getter instead.
+  @override
   @mustCallSuper
   @Deprecated('7.0.0')
   Map getInitialState() => throw _unsupportedLifecycleError('getInitialState');
 
-  /// Invoked once and cached when [reactComponentClass] is called. Values in the mapping will be set on [props]
+  /// Invoked once and cached when [registerComponent] is called. Values in the mapping will be set on [props]
   /// if that prop is not specified by the parent component.
   ///
   /// This method is invoked before any instances are created and thus cannot rely on [props]. In addition, be aware
   /// that any complex objects returned by `getDefaultProps` will be shared across instances, not copied.
   ///
-  /// See: <https://facebook.github.io/react/docs/react-component.html#getdefaultprops>
+  /// See: <https://reactjs.org/docs/react-component.html#getdefaultprops>
   ///
   /// > __DEPRECATED - DO NOT USE__
   /// >
   /// > Use the [defaultProps] getter instead.
+  @override
   @mustCallSuper
   @Deprecated('7.0.0')
   Map getDefaultProps() => throw _unsupportedLifecycleError('getDefaultProps');
@@ -995,6 +1009,7 @@ abstract class Component2 implements Component {
   /// > __DEPRECATED - DO NOT USE__
   /// >
   /// > Use [componentDidMount] instead
+  @override
   @mustCallSuper
   @Deprecated('7.0.0')
   void componentWillMount() => throw _unsupportedLifecycleError('componentWillMount');
@@ -1052,6 +1067,7 @@ abstract class Component2 implements Component {
   ///
   ///       // NOTE: You could also return a `snapshot` value from this method for later use in `componentDidUpdate`.
   ///     }
+  @override
   @mustCallSuper
   @Deprecated('7.0.0')
   void componentWillReceiveProps(Map nextProps) => throw _unsupportedLifecycleError('componentWillReceiveProps');
@@ -1094,6 +1110,7 @@ abstract class Component2 implements Component {
   ///
   ///       // NOTE: You could also return a `snapshot` value from this method for later use in `componentDidUpdate`.
   ///     }
+  @override
   @mustCallSuper
   @Deprecated('7.0.0')
   void componentWillUpdate(Map nextProps, Map nextState) => throw _unsupportedLifecycleError('componentWillUpdate');
@@ -1145,8 +1162,7 @@ abstract class Component2 implements Component {
   // Other deprecated and unsupported members
   // ******************************************************************************************************************
 
-  UnsupportedError _unsupportedError(String memberName) =>
-      new UnsupportedError('Component2 drops support for $memberName');
+  UnsupportedError _unsupportedError(String memberName) => UnsupportedError('Component2 drops support for $memberName');
 
   /// Do not use.
   ///
@@ -1210,6 +1226,7 @@ abstract class Component2 implements Component {
   @override
   @Deprecated('7.0.0')
   Map get prevState => throw _unsupportedError('"Legacy" Context [prevContext]');
+  @override
   set prevState(_) => throw _unsupportedError('"Legacy" Context [prevContext]');
 
   /// Do not use.
@@ -1225,6 +1242,7 @@ abstract class Component2 implements Component {
   @override
   @Deprecated('7.0.0')
   Map get nextProps => throw _unsupportedError('nextProps');
+  @override
   set nextProps(_) => throw _unsupportedError('nextProps');
 
   /// Do not use.
@@ -1240,6 +1258,7 @@ abstract class Component2 implements Component {
   @override
   @Deprecated('7.0.0')
   RefMethod get ref => throw _unsupportedError('ref');
+  @override
   set ref(_) => throw _unsupportedError('ref');
 
   /// Do not use.
@@ -1339,12 +1358,12 @@ mixin TypedSnapshot<TSnapshot> {
   void componentDidUpdate(Map prevProps, Map prevState, [covariant TSnapshot snapshot]);
 }
 
-/// Creates a ReactJS virtual DOM instance (`ReactElement` on the client).
+/// Creates a ReactJS virtual DOM instance ([ReactElement] on the client).
 abstract class ReactComponentFactoryProxy implements Function {
   /// The type of component created by this factory.
   get type;
 
-  /// Returns a new rendered component instance with the specified [props] and [children].
+  /// Returns a new rendered component instance with the specified [props] and [childrenArgs].
   ///
   /// Necessary to work around DDC `dart.dcall` issues in <https://github.com/dart-lang/sdk/issues/29904>,
   /// since invoking the function directly doesn't work.
@@ -1463,31 +1482,31 @@ abstract class ReactComponentFactoryProxy implements Function {
   }
 }
 
-const _notSpecified = const NotSpecified();
+const _notSpecified = NotSpecified();
 
 class NotSpecified {
   const NotSpecified();
 }
 
-/// Registers [componentFactory] on both client and server.
+/// Registers a component factory on both client and server.
 @Deprecated('Use registerComponent2 after migrating your components from Component to Component2.')
 /*ComponentRegistrar*/ Function registerComponent = validateJsApiThenReturn(() => registration_utils.registerComponent);
 
-/// Registers [componentFactory] on both client and server.
+/// Registers a component factory on both client and server.
 ComponentRegistrar2 registerComponent2 = validateJsApiThenReturn(() => registration_utils.registerComponent2);
 
-/// Registers [componentFactory] on client.
+/// Registers a function component on the client.
 ///
 /// Example:
 /// ```
-/// var myFunctionComponent = registerFunctionComponent((Map props) {
+/// var myFunctionComponent = registerFunctionComponent((props) {
 ///   return ['I am a function component', ...props.children];
 /// });
 /// ```
 ///
 /// Example with display name:
 /// ```
-/// var myFunctionComponent = registerFunctionComponent((Map props) {
+/// var myFunctionComponent = registerFunctionComponent((props) {
 ///   return ['I am a function component', ...props.children];
 /// }, displayName: 'myFunctionComponent');
 /// ```
@@ -1501,802 +1520,598 @@ ComponentRegistrar2 registerComponent2 = validateJsApiThenReturn(() => registrat
 FunctionComponentRegistrar registerFunctionComponent =
     validateJsApiThenReturn(() => registration_utils.registerFunctionComponent);
 
-/// The HTML `<a>` [AnchorElement].
+/// The HTML `<a>` `AnchorElement`.
 dynamic a = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('a'));
 
-/// The HTML `<abbr>` [Element].
+/// The HTML `<abbr>` `Element`.
 dynamic abbr = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('abbr'));
 
-/// The HTML `<address>` [Element].
+/// The HTML `<address>` `Element`.
 dynamic address = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('address'));
 
-/// The HTML `<area>` [AreaElement].
+/// The HTML `<area>` `AreaElement`.
 dynamic area = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('area'));
 
-/// The HTML `<article>` [Element].
+/// The HTML `<article>` `Element`.
 dynamic article = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('article'));
 
-/// The HTML `<aside>` [Element].
+/// The HTML `<aside>` `Element`.
 dynamic aside = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('aside'));
 
-/// The HTML `<audio>` [AudioElement].
+/// The HTML `<audio>` `AudioElement`.
 dynamic audio = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('audio'));
 
-/// The HTML `<b>` [Element].
+/// The HTML `<b>` `Element`.
 dynamic b = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('b'));
 
-/// The HTML `<base>` [BaseElement].
+/// The HTML `<base>` `BaseElement`.
 dynamic base = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('base'));
 
-/// The HTML `<bdi>` [Element].
+/// The HTML `<bdi>` `Element`.
 dynamic bdi = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('bdi'));
 
-/// The HTML `<bdo>` [Element].
+/// The HTML `<bdo>` `Element`.
 dynamic bdo = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('bdo'));
 
-/// The HTML `<big>` [Element].
+/// The HTML `<big>` `Element`.
 dynamic big = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('big'));
 
-/// The HTML `<blockquote>` [Element].
+/// The HTML `<blockquote>` `Element`.
 dynamic blockquote = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('blockquote'));
 
-/// The HTML `<body>` [BodyElement].
+/// The HTML `<body>` `BodyElement`.
 dynamic body = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('body'));
 
-/// The HTML `<br>` [BRElement].
+/// The HTML `<br>` `BRElement`.
 dynamic br = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('br'));
 
-/// The HTML `<button>` [ButtonElement].
+/// The HTML `<button>` `ButtonElement`.
 dynamic button = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('button'));
 
-/// The HTML `<canvas>` [CanvasElement].
+/// The HTML `<canvas>` `CanvasElement`.
 dynamic canvas = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('canvas'));
 
-/// The HTML `<caption>` [Element].
+/// The HTML `<caption>` `Element`.
 dynamic caption = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('caption'));
 
-/// The HTML `<cite>` [Element].
+/// The HTML `<cite>` `Element`.
 dynamic cite = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('cite'));
 
-/// The HTML `<code>` [Element].
+/// The HTML `<code>` `Element`.
 dynamic code = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('code'));
 
-/// The HTML `<col>` [Element].
+/// The HTML `<col>` `Element`.
 dynamic col = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('col'));
 
-/// The HTML `<colgroup>` [Element].
+/// The HTML `<colgroup>` `Element`.
 dynamic colgroup = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('colgroup'));
 
-/// The HTML `<data>` [Element].
+/// The HTML `<data>` `Element`.
 dynamic data = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('data'));
 
-/// The HTML `<datalist>` [DataListElement].
+/// The HTML `<datalist>` `DataListElement`.
 dynamic datalist = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('datalist'));
 
-/// The HTML `<dd>` [Element].
+/// The HTML `<dd>` `Element`.
 dynamic dd = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('dd'));
 
-/// The HTML `<del>` [Element].
+/// The HTML `<del>` `Element`.
 dynamic del = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('del'));
 
-/// The HTML `<details>` [DetailsElement].
+/// The HTML `<details>` `DetailsElement`.
 dynamic details = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('details'));
 
-/// The HTML `<dfn>` [Element].
+/// The HTML `<dfn>` `Element`.
 dynamic dfn = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('dfn'));
 
-/// The HTML `<dialog>` [DialogElement].
+/// The HTML `<dialog>` `DialogElement`.
 dynamic dialog = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('dialog'));
 
-/// The HTML `<div>` [DivElement].
+/// The HTML `<div>` `DivElement`.
 dynamic div = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('div'));
 
-/// The HTML `<dl>` [DListElement].
+/// The HTML `<dl>` `DListElement`.
 dynamic dl = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('dl'));
 
-/// The HTML `<dt>` [Element].
+/// The HTML `<dt>` `Element`.
 dynamic dt = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('dt'));
 
-/// The HTML `<em>` [Element].
+/// The HTML `<em>` `Element`.
 dynamic em = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('em'));
 
-/// The HTML `<embed>` [EmbedElement].
+/// The HTML `<embed>` `EmbedElement`.
 dynamic embed = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('embed'));
 
-/// The HTML `<fieldset>` [FieldSetElement].
+/// The HTML `<fieldset>` `FieldSetElement`.
 dynamic fieldset = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('fieldset'));
 
-/// The HTML `<figcaption>` [Element].
+/// The HTML `<figcaption>` `Element`.
 dynamic figcaption = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('figcaption'));
 
-/// The HTML `<figure>` [Element].
+/// The HTML `<figure>` `Element`.
 dynamic figure = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('figure'));
 
-/// The HTML `<footer>` [Element].
+/// The HTML `<footer>` `Element`.
 dynamic footer = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('footer'));
 
-/// The HTML `<form>` [FormElement].
+/// The HTML `<form>` `FormElement`.
 dynamic form = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('form'));
 
-/// The HTML `<h1>` [HeadingElement].
+/// The HTML `<h1>` `HeadingElement`.
 dynamic h1 = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('h1'));
 
-/// The HTML `<h2>` [HeadingElement].
+/// The HTML `<h2>` `HeadingElement`.
 dynamic h2 = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('h2'));
 
-/// The HTML `<h3>` [HeadingElement].
+/// The HTML `<h3>` `HeadingElement`.
 dynamic h3 = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('h3'));
 
-/// The HTML `<h4>` [HeadingElement].
+/// The HTML `<h4>` `HeadingElement`.
 dynamic h4 = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('h4'));
 
-/// The HTML `<h5>` [HeadingElement].
+/// The HTML `<h5>` `HeadingElement`.
 dynamic h5 = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('h5'));
 
-/// The HTML `<h6>` [HeadingElement].
+/// The HTML `<h6>` `HeadingElement`.
 dynamic h6 = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('h6'));
 
-/// The HTML `<head>` [HeadElement].
+/// The HTML `<head>` `HeadElement`.
 dynamic head = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('head'));
 
-/// The HTML `<header>` [Element].
+/// The HTML `<header>` `Element`.
 dynamic header = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('header'));
 
-/// The HTML `<hr>` [HRElement].
+/// The HTML `<hr>` `HRElement`.
 dynamic hr = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('hr'));
 
-/// The HTML `<html>` [HtmlHtmlElement].
+/// The HTML `<html>` `HtmlHtmlElement`.
 dynamic html = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('html'));
 
-/// The HTML `<i>` [Element].
+/// The HTML `<i>` `Element`.
 dynamic i = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('i'));
 
-/// The HTML `<iframe>` [IFrameElement].
+/// The HTML `<iframe>` `IFrameElement`.
 dynamic iframe = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('iframe'));
 
-/// The HTML `<img>` [ImageElement].
+/// The HTML `<img>` `ImageElement`.
 dynamic img = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('img'));
 
-/// The HTML `<input>` [InputElement].
+/// The HTML `<input>` `InputElement`.
 dynamic input = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('input'));
 
-/// The HTML `<ins>` [Element].
+/// The HTML `<ins>` `Element`.
 dynamic ins = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('ins'));
 
-/// The HTML `<kbd>` [Element].
+/// The HTML `<kbd>` `Element`.
 dynamic kbd = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('kbd'));
 
-/// The HTML `<keygen>` [KeygenElement].
+/// The HTML `<keygen>` `KeygenElement`.
 dynamic keygen = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('keygen'));
 
-/// The HTML `<label>` [LabelElement].
+/// The HTML `<label>` `LabelElement`.
 dynamic label = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('label'));
 
-/// The HTML `<legend>` [LegendElement].
+/// The HTML `<legend>` `LegendElement`.
 dynamic legend = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('legend'));
 
-/// The HTML `<li>` [LIElement].
+/// The HTML `<li>` `LIElement`.
 dynamic li = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('li'));
 
-/// The HTML `<link>` [LinkElement].
+/// The HTML `<link>` `LinkElement`.
 dynamic link = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('link'));
 
-/// The HTML `<main>` [Element].
+/// The HTML `<main>` `Element`.
 dynamic main = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('main'));
 
-/// The HTML `<map>` [MapElement].
+/// The HTML `<map>` `MapElement`.
 dynamic map = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('map'));
 
-/// The HTML `<mark>` [Element].
+/// The HTML `<mark>` `Element`.
 dynamic mark = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('mark'));
 
-/// The HTML `<menu>` [MenuElement].
+/// The HTML `<menu>` `MenuElement`.
 dynamic menu = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('menu'));
 
-/// The HTML `<menuitem>` [MenuItemElement].
+/// The HTML `<menuitem>` `MenuItemElement`.
 dynamic menuitem = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('menuitem'));
 
-/// The HTML `<meta>` [MetaElement].
+/// The HTML `<meta>` `MetaElement`.
 dynamic meta = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('meta'));
 
-/// The HTML `<meter>` [MeterElement].
+/// The HTML `<meter>` `MeterElement`.
 dynamic meter = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('meter'));
 
-/// The HTML `<nav>` [Element].
+/// The HTML `<nav>` `Element`.
 dynamic nav = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('nav'));
 
-/// The HTML `<noscript>` [Element].
+/// The HTML `<noscript>` `Element`.
 dynamic noscript = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('noscript'));
 
-/// The HTML `<object>` [ObjectElement].
+/// The HTML `<object>` `ObjectElement`.
 dynamic object = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('object'));
 
-/// The HTML `<ol>` [OListElement].
+/// The HTML `<ol>` `OListElement`.
 dynamic ol = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('ol'));
 
-/// The HTML `<optgroup>` [OptGroupElement].
+/// The HTML `<optgroup>` `OptGroupElement`.
 dynamic optgroup = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('optgroup'));
 
-/// The HTML `<option>` [OptionElement].
+/// The HTML `<option>` `OptionElement`.
 dynamic option = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('option'));
 
-/// The HTML `<output>` [OutputElement].
+/// The HTML `<output>` `OutputElement`.
 dynamic output = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('output'));
 
-/// The HTML `<p>` [ParagraphElement].
+/// The HTML `<p>` `ParagraphElement`.
 dynamic p = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('p'));
 
-/// The HTML `<param>` [ParamElement].
+/// The HTML `<param>` `ParamElement`.
 dynamic param = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('param'));
 
-/// The HTML `<picture>` [PictureElement].
+/// The HTML `<picture>` `PictureElement`.
 dynamic picture = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('picture'));
 
-/// The HTML `<pre>` [PreElement].
+/// The HTML `<pre>` `PreElement`.
 dynamic pre = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('pre'));
 
-/// The HTML `<progress>` [ProgressElement].
+/// The HTML `<progress>` `ProgressElement`.
 dynamic progress = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('progress'));
 
-/// The HTML `<q>` [QuoteElement].
+/// The HTML `<q>` `QuoteElement`.
 dynamic q = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('q'));
 
-/// The HTML `<rp>` [Element].
+/// The HTML `<rp>` `Element`.
 dynamic rp = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('rp'));
 
-/// The HTML `<rt>` [Element].
+/// The HTML `<rt>` `Element`.
 dynamic rt = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('rt'));
 
-/// The HTML `<ruby>` [Element].
+/// The HTML `<ruby>` `Element`.
 dynamic ruby = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('ruby'));
 
-/// The HTML `<s>` [Element].
+/// The HTML `<s>` `Element`.
 dynamic s = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('s'));
 
-/// The HTML `<samp>` [Element].
+/// The HTML `<samp>` `Element`.
 dynamic samp = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('samp'));
 
-/// The HTML `<script>` [ScriptElement].
+/// The HTML `<script>` `ScriptElement`.
 dynamic script = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('script'));
 
-/// The HTML `<section>` [Element].
+/// The HTML `<section>` `Element`.
 dynamic section = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('section'));
 
-/// The HTML `<select>` [SelectElement].
+/// The HTML `<select>` `SelectElement`.
 dynamic select = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('select'));
 
-/// The HTML `<small>` [Element].
+/// The HTML `<small>` `Element`.
 dynamic small = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('small'));
 
-/// The HTML `<source>` [SourceElement].
+/// The HTML `<source>` `SourceElement`.
 dynamic source = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('source'));
 
-/// The HTML `<span>` [SpanElement].
+/// The HTML `<span>` `SpanElement`.
 dynamic span = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('span'));
 
-/// The HTML `<strong>` [Element].
+/// The HTML `<strong>` `Element`.
 dynamic strong = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('strong'));
 
-/// The HTML `<style>` [StyleElement].
+/// The HTML `<style>` `StyleElement`.
 dynamic style = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('style'));
 
-/// The HTML `<sub>` [Element].
+/// The HTML `<sub>` `Element`.
 dynamic sub = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('sub'));
 
-/// The HTML `<summary>` [Element].
+/// The HTML `<summary>` `Element`.
 dynamic summary = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('summary'));
 
-/// The HTML `<sup>` [Element].
+/// The HTML `<sup>` `Element`.
 dynamic sup = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('sup'));
 
-/// The HTML `<table>` [TableElement].
+/// The HTML `<table>` `TableElement`.
 dynamic table = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('table'));
 
-/// The HTML `<tbody>` [TableSectionElement].
+/// The HTML `<tbody>` `TableSectionElement`.
 dynamic tbody = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('tbody'));
 
-/// The HTML `<td>` [TableCellElement].
+/// The HTML `<td>` `TableCellElement`.
 dynamic td = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('td'));
 
-/// The HTML `<textarea>` [TextAreaElement].
+/// The HTML `<textarea>` `TextAreaElement`.
 dynamic textarea = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('textarea'));
 
-/// The HTML `<tfoot>` [TableSectionElement].
+/// The HTML `<tfoot>` `TableSectionElement`.
 dynamic tfoot = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('tfoot'));
 
-/// The HTML `<th>` [TableCellElement].
+/// The HTML `<th>` `TableCellElement`.
 dynamic th = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('th'));
 
-/// The HTML `<thead>` [TableSectionElement].
+/// The HTML `<thead>` `TableSectionElement`.
 dynamic thead = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('thead'));
 
-/// The HTML `<time>` [TimeInputElement].
+/// The HTML `<time>` `TimeInputElement`.
 dynamic time = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('time'));
 
-/// The HTML `<title>` [TitleElement].
+/// The HTML `<title>` `TitleElement`.
 dynamic title = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('title'));
 
-/// The HTML `<tr>` [TableRowElement].
+/// The HTML `<tr>` `TableRowElement`.
 dynamic tr = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('tr'));
 
-/// The HTML `<track>` [TrackElement].
+/// The HTML `<track>` `TrackElement`.
 dynamic track = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('track'));
 
-/// The HTML `<u>` [Element].
+/// The HTML `<u>` `Element`.
 dynamic u = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('u'));
 
-/// The HTML `<ul>` [UListElement].
+/// The HTML `<ul>` `UListElement`.
 dynamic ul = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('ul'));
 
-/// The HTML `<var>` [Element].
+/// The HTML `<var>` `Element`.
 ///
 /// _Named variable because `var` is a reserved word in Dart._
 dynamic variable = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('var'));
 
-/// The HTML `<video>` [VideoElement].
+/// The HTML `<video>` `VideoElement`.
 dynamic video = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('video'));
 
-/// The HTML `<wbr>` [Element].
+/// The HTML `<wbr>` `Element`.
 dynamic wbr = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('wbr'));
 
-/// The SVG `<altGlyph>` [AltGlyphElement].
+/// The SVG `<altGlyph>` `AltGlyphElement`.
 dynamic altGlyph = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('altGlyph'));
 
-/// The SVG `<altGlyphDef>` [AltGlyphDefElement].
+/// The SVG `<altGlyphDef>` `AltGlyphDefElement`.
 dynamic altGlyphDef = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('altGlyphDef'));
 
-/// The SVG `<altGlyphItem>` [AltGlyphItemElement].
+/// The SVG `<altGlyphItem>` `AltGlyphItemElement`.
 dynamic altGlyphItem = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('altGlyphItem'));
 
-/// The SVG `<animate>` [AnimateElement].
+/// The SVG `<animate>` `AnimateElement`.
 dynamic animate = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('animate'));
 
-/// The SVG `<animateColor>` [AnimateColorElement].
+/// The SVG `<animateColor>` `AnimateColorElement`.
 dynamic animateColor = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('animateColor'));
 
-/// The SVG `<animateMotion>` [AnimateMotionElement].
+/// The SVG `<animateMotion>` `AnimateMotionElement`.
 dynamic animateMotion = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('animateMotion'));
 
-/// The SVG `<animateTransform>` [AnimateTransformElement].
+/// The SVG `<animateTransform>` `AnimateTransformElement`.
 dynamic animateTransform = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('animateTransform'));
 
-/// The SVG `<circle>` [CircleElement].
+/// The SVG `<circle>` `CircleElement`.
 dynamic circle = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('circle'));
 
-/// The SVG `<clipPath>` [ClipPathElement].
+/// The SVG `<clipPath>` `ClipPathElement`.
 dynamic clipPath = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('clipPath'));
 
-/// The SVG `<color-profile>` [ColorProfileElement].
+/// The SVG `<color-profile>` `ColorProfileElement`.
 dynamic colorProfile = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('color-profile'));
 
-/// The SVG `<cursor>` [CursorElement].
+/// The SVG `<cursor>` `CursorElement`.
 dynamic cursor = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('cursor'));
 
-/// The SVG `<defs>` [DefsElement].
+/// The SVG `<defs>` `DefsElement`.
 dynamic defs = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('defs'));
 
-/// The SVG `<desc>` [DescElement].
+/// The SVG `<desc>` `DescElement`.
 dynamic desc = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('desc'));
 
-/// The SVG `<discard>` [DiscardElement].
+/// The SVG `<discard>` `DiscardElement`.
 dynamic discard = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('discard'));
 
-/// The SVG `<ellipse>` [EllipseElement].
+/// The SVG `<ellipse>` `EllipseElement`.
 dynamic ellipse = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('ellipse'));
 
-/// The SVG `<feBlend>` [FeBlendElement].
+/// The SVG `<feBlend>` `FeBlendElement`.
 dynamic feBlend = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feBlend'));
 
-/// The SVG `<feColorMatrix>` [FeColorMatrixElement].
+/// The SVG `<feColorMatrix>` `FeColorMatrixElement`.
 dynamic feColorMatrix = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feColorMatrix'));
 
-/// The SVG `<feComponentTransfer>` [FeComponentTransferElement].
+/// The SVG `<feComponentTransfer>` `FeComponentTransferElement`.
 dynamic feComponentTransfer = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feComponentTransfer'));
 
-/// The SVG `<feComposite>` [FeCompositeElement].
+/// The SVG `<feComposite>` `FeCompositeElement`.
 dynamic feComposite = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feComposite'));
 
-/// The SVG `<feConvolveMatrix>` [FeConvolveMatrixElement].
+/// The SVG `<feConvolveMatrix>` `FeConvolveMatrixElement`.
 dynamic feConvolveMatrix = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feConvolveMatrix'));
 
-/// The SVG `<feDiffuseLighting>` [FeDiffuseLightingElement].
+/// The SVG `<feDiffuseLighting>` `FeDiffuseLightingElement`.
 dynamic feDiffuseLighting = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feDiffuseLighting'));
 
-/// The SVG `<feDisplacementMap>` [FeDisplacementMapElement].
+/// The SVG `<feDisplacementMap>` `FeDisplacementMapElement`.
 dynamic feDisplacementMap = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feDisplacementMap'));
 
-/// The SVG `<feDistantLight>` [FeDistantLightElement].
+/// The SVG `<feDistantLight>` `FeDistantLightElement`.
 dynamic feDistantLight = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feDistantLight'));
 
-/// The SVG `<feDropShadow>` [FeDropShadowElement].
+/// The SVG `<feDropShadow>` `FeDropShadowElement`.
 dynamic feDropShadow = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feDropShadow'));
 
-/// The SVG `<feFlood>` [FeFloodElement].
+/// The SVG `<feFlood>` `FeFloodElement`.
 dynamic feFlood = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feFlood'));
 
-/// The SVG `<feFuncA>` [FeFuncAElement].
+/// The SVG `<feFuncA>` `FeFuncAElement`.
 dynamic feFuncA = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feFuncA'));
 
-/// The SVG `<feFuncB>` [FeFuncBElement].
+/// The SVG `<feFuncB>` `FeFuncBElement`.
 dynamic feFuncB = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feFuncB'));
 
-/// The SVG `<feFuncG>` [FeFuncGElement].
+/// The SVG `<feFuncG>` `FeFuncGElement`.
 dynamic feFuncG = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feFuncG'));
 
-/// The SVG `<feFuncR>` [FeFuncRElement].
+/// The SVG `<feFuncR>` `FeFuncRElement`.
 dynamic feFuncR = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feFuncR'));
 
-/// The SVG `<feGaussianBlur>` [FeGaussianBlurElement].
+/// The SVG `<feGaussianBlur>` `FeGaussianBlurElement`.
 dynamic feGaussianBlur = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feGaussianBlur'));
 
-/// The SVG `<feImage>` [FeImageElement].
+/// The SVG `<feImage>` `FeImageElement`.
 dynamic feImage = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feImage'));
 
-/// The SVG `<feMerge>` [FeMergeElement].
+/// The SVG `<feMerge>` `FeMergeElement`.
 dynamic feMerge = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feMerge'));
 
-/// The SVG `<feMergeNode>` [FeMergeNodeElement].
+/// The SVG `<feMergeNode>` `FeMergeNodeElement`.
 dynamic feMergeNode = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feMergeNode'));
 
-/// The SVG `<feMorphology>` [FeMorphologyElement].
+/// The SVG `<feMorphology>` `FeMorphologyElement`.
 dynamic feMorphology = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feMorphology'));
 
-/// The SVG `<feOffset>` [FeOffsetElement].
+/// The SVG `<feOffset>` `FeOffsetElement`.
 dynamic feOffset = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feOffset'));
 
-/// The SVG `<fePointLight>` [FePointLightElement].
+/// The SVG `<fePointLight>` `FePointLightElement`.
 dynamic fePointLight = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('fePointLight'));
 
-/// The SVG `<feSpecularLighting>` [FeSpecularLightingElement].
+/// The SVG `<feSpecularLighting>` `FeSpecularLightingElement`.
 dynamic feSpecularLighting = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feSpecularLighting'));
 
-/// The SVG `<feSpotLight>` [FeSpotLightElement].
+/// The SVG `<feSpotLight>` `FeSpotLightElement`.
 dynamic feSpotLight = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feSpotLight'));
 
-/// The SVG `<feTile>` [FeTileElement].
+/// The SVG `<feTile>` `FeTileElement`.
 dynamic feTile = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feTile'));
 
-/// The SVG `<feTurbulence>` [FeTurbulenceElement].
+/// The SVG `<feTurbulence>` `FeTurbulenceElement`.
 dynamic feTurbulence = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('feTurbulence'));
 
-/// The SVG `<filter>` [FilterElement].
+/// The SVG `<filter>` `FilterElement`.
 dynamic filter = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('filter'));
 
-/// The SVG `<font>` [FontElement].
+/// The SVG `<font>` `FontElement`.
 dynamic font = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('font'));
 
-/// The SVG `<font-face>` [FontFaceElement].
+/// The SVG `<font-face>` `FontFaceElement`.
 dynamic fontFace = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('font-face'));
 
-/// The SVG `<font-face-format>` [FontFaceFormatElement].
+/// The SVG `<font-face-format>` `FontFaceFormatElement`.
 dynamic fontFaceFormat = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('font-face-format'));
 
-/// The SVG `<font-face-name>` [FontFaceNameElement].
+/// The SVG `<font-face-name>` `FontFaceNameElement`.
 dynamic fontFaceName = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('font-face-name'));
 
-/// The SVG `<font-face-src>` [FontFaceSrcElement].
+/// The SVG `<font-face-src>` `FontFaceSrcElement`.
 dynamic fontFaceSrc = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('font-face-src'));
 
-/// The SVG `<font-face-uri>` [FontFaceUriElement].
+/// The SVG `<font-face-uri>` `FontFaceUriElement`.
 dynamic fontFaceUri = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('font-face-uri'));
 
-/// The SVG `<foreignObject>` [ForeignObjectElement].
+/// The SVG `<foreignObject>` `ForeignObjectElement`.
 dynamic foreignObject = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('foreignObject'));
 
-/// The SVG `<g>` [GElement].
+/// The SVG `<g>` `GElement`.
 dynamic g = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('g'));
 
-/// The SVG `<glyph>` [GlyphElement].
+/// The SVG `<glyph>` `GlyphElement`.
 dynamic glyph = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('glyph'));
 
-/// The SVG `<glyphRef>` [GlyphRefElement].
+/// The SVG `<glyphRef>` `GlyphRefElement`.
 dynamic glyphRef = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('glyphRef'));
 
-/// The SVG `<hatch>` [HatchElement].
+/// The SVG `<hatch>` `HatchElement`.
 dynamic hatch = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('hatch'));
 
-/// The SVG `<hatchpath>` [HatchpathElement].
+/// The SVG `<hatchpath>` `HatchpathElement`.
 dynamic hatchpath = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('hatchpath'));
 
-/// The SVG `<hkern>` [HkernElement].
+/// The SVG `<hkern>` `HkernElement`.
 dynamic hkern = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('hkern'));
 
-/// The SVG `<image>` [ImageElement].
+/// The SVG `<image>` `ImageElement`.
 dynamic image = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('image'));
 
-/// The SVG `<line>` [LineElement].
+/// The SVG `<line>` `LineElement`.
 dynamic line = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('line'));
 
-/// The SVG `<linearGradient>` [LinearGradientElement].
+/// The SVG `<linearGradient>` `LinearGradientElement`.
 dynamic linearGradient = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('linearGradient'));
 
-/// The SVG `<marker>` [MarkerElement].
+/// The SVG `<marker>` `MarkerElement`.
 dynamic marker = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('marker'));
 
-/// The SVG `<mask>` [MaskElement].
+/// The SVG `<mask>` `MaskElement`.
 dynamic mask = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('mask'));
 
-/// The SVG `<mesh>` [MeshElement].
+/// The SVG `<mesh>` `MeshElement`.
 dynamic mesh = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('mesh'));
 
-/// The SVG `<meshgradient>` [MeshgradientElement].
+/// The SVG `<meshgradient>` `MeshgradientElement`.
 dynamic meshgradient = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('meshgradient'));
 
-/// The SVG `<meshpatch>` [MeshpatchElement].
+/// The SVG `<meshpatch>` `MeshpatchElement`.
 dynamic meshpatch = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('meshpatch'));
 
-/// The SVG `<meshrow>` [MeshrowElement].
+/// The SVG `<meshrow>` `MeshrowElement`.
 dynamic meshrow = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('meshrow'));
 
-/// The SVG `<metadata>` [MetadataElement].
+/// The SVG `<metadata>` `MetadataElement`.
 dynamic metadata = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('metadata'));
 
-/// The SVG `<missing-glyph>` [MissingGlyphElement].
+/// The SVG `<missing-glyph>` `MissingGlyphElement`.
 dynamic missingGlyph = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('missing-glyph'));
 
-/// The SVG `<mpath>` [MpathElement].
+/// The SVG `<mpath>` `MpathElement`.
 dynamic mpath = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('mpath'));
 
-/// The SVG `<path>` [PathElement].
+/// The SVG `<path>` `PathElement`.
 dynamic path = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('path'));
 
-/// The SVG `<pattern>` [PatternElement].
+/// The SVG `<pattern>` `PatternElement`.
 dynamic pattern = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('pattern'));
 
-/// The SVG `<polygon>` [PolygonElement].
+/// The SVG `<polygon>` `PolygonElement`.
 dynamic polygon = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('polygon'));
 
-/// The SVG `<polyline>` [PolylineElement].
+/// The SVG `<polyline>` `PolylineElement`.
 dynamic polyline = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('polyline'));
 
-/// The SVG `<radialGradient>` [RadialGradientElement].
+/// The SVG `<radialGradient>` `RadialGradientElement`.
 dynamic radialGradient = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('radialGradient'));
 
-/// The SVG `<rect>` [RectElement].
+/// The SVG `<rect>` `RectElement`.
 dynamic rect = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('rect'));
 
-/// The SVG `<set>` [SetElement].
+/// The SVG `<set>` `SetElement`.
 dynamic svgSet = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('set'));
 
-/// The SVG `<solidcolor>` [SolidcolorElement].
+/// The SVG `<solidcolor>` `SolidcolorElement`.
 dynamic solidcolor = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('solidcolor'));
 
-/// The SVG `<stop>` [StopElement].
+/// The SVG `<stop>` `StopElement`.
 dynamic stop = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('stop'));
 
-/// The SVG `<svg>` [SvgSvgElement].
+/// The SVG `<svg>` `SvgSvgElement`.
 dynamic svg = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('svg'));
 
-/// The SVG `<switch>` [SwitchElement].
+/// The SVG `<switch>` `SwitchElement`.
 dynamic svgSwitch = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('switch'));
 
-/// The SVG `<symbol>` [SymbolElement].
+/// The SVG `<symbol>` `SymbolElement`.
 dynamic symbol = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('symbol'));
 
-/// The SVG `<text>` [TextElement].
+/// The SVG `<text>` `TextElement`.
 dynamic text = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('text'));
 
-/// The SVG `<textPath>` [TextPathElement].
+/// The SVG `<textPath>` `TextPathElement`.
 dynamic textPath = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('textPath'));
 
-/// The SVG `<tref>` [TrefElement].
+/// The SVG `<tref>` `TrefElement`.
 dynamic tref = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('tref'));
 
-/// The SVG `<tspan>` [TSpanElement].
+/// The SVG `<tspan>` `TSpanElement`.
 dynamic tspan = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('tspan'));
 
-/// The SVG `<unknown>` [UnknownElement].
+/// The SVG `<unknown>` `UnknownElement`.
 dynamic unknown = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('unknown'));
 
-/// The SVG `<use>` [UseElement].
+/// The SVG `<use>` `UseElement`.
 dynamic use = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('use'));
 
-/// The SVG `<view>` [ViewElement].
+/// The SVG `<view>` `ViewElement`.
 dynamic view = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('view'));
 
-/// The SVG `<vkern>` [VkernElement].
+/// The SVG `<vkern>` `VkernElement`.
 dynamic vkern = validateJsApiThenReturn(() => ReactDomComponentFactoryProxy('vkern'));
-
-/// Create React DOM `Component`s by calling the specified [creator].
-_createDOMComponents(creator) {
-  a = creator('a');
-  abbr = creator('abbr');
-  address = creator('address');
-  area = creator('area');
-  article = creator('article');
-  aside = creator('aside');
-  audio = creator('audio');
-  b = creator('b');
-  base = creator('base');
-  bdi = creator('bdi');
-  bdo = creator('bdo');
-  big = creator('big');
-  blockquote = creator('blockquote');
-  body = creator('body');
-  br = creator('br');
-  button = creator('button');
-  canvas = creator('canvas');
-  caption = creator('caption');
-  cite = creator('cite');
-  code = creator('code');
-  col = creator('col');
-  colgroup = creator('colgroup');
-  data = creator('data');
-  datalist = creator('datalist');
-  dd = creator('dd');
-  del = creator('del');
-  details = creator('details');
-  dfn = creator('dfn');
-  dialog = creator('dialog');
-  div = creator('div');
-  dl = creator('dl');
-  dt = creator('dt');
-  em = creator('em');
-  embed = creator('embed');
-  fieldset = creator('fieldset');
-  figcaption = creator('figcaption');
-  figure = creator('figure');
-  footer = creator('footer');
-  form = creator('form');
-  h1 = creator('h1');
-  h2 = creator('h2');
-  h3 = creator('h3');
-  h4 = creator('h4');
-  h5 = creator('h5');
-  h6 = creator('h6');
-  head = creator('head');
-  header = creator('header');
-  hr = creator('hr');
-  html = creator('html');
-  i = creator('i');
-  iframe = creator('iframe');
-  img = creator('img');
-  input = creator('input');
-  ins = creator('ins');
-  kbd = creator('kbd');
-  keygen = creator('keygen');
-  label = creator('label');
-  legend = creator('legend');
-  li = creator('li');
-  link = creator('link');
-  main = creator('main');
-  map = creator('map');
-  mark = creator('mark');
-  menu = creator('menu');
-  menuitem = creator('menuitem');
-  meta = creator('meta');
-  meter = creator('meter');
-  nav = creator('nav');
-  noscript = creator('noscript');
-  object = creator('object');
-  ol = creator('ol');
-  optgroup = creator('optgroup');
-  option = creator('option');
-  output = creator('output');
-  p = creator('p');
-  param = creator('param');
-  picture = creator('picture');
-  pre = creator('pre');
-  progress = creator('progress');
-  q = creator('q');
-  rp = creator('rp');
-  rt = creator('rt');
-  ruby = creator('ruby');
-  s = creator('s');
-  samp = creator('samp');
-  script = creator('script');
-  section = creator('section');
-  select = creator('select');
-  small = creator('small');
-  source = creator('source');
-  span = creator('span');
-  strong = creator('strong');
-  style = creator('style');
-  sub = creator('sub');
-  summary = creator('summary');
-  sup = creator('sup');
-  table = creator('table');
-  tbody = creator('tbody');
-  td = creator('td');
-  textarea = creator('textarea');
-  tfoot = creator('tfoot');
-  th = creator('th');
-  thead = creator('thead');
-  time = creator('time');
-  title = creator('title');
-  tr = creator('tr');
-  track = creator('track');
-  u = creator('u');
-  ul = creator('ul');
-  variable = creator('var');
-  video = creator('video');
-  wbr = creator('wbr');
-
-  // SVG Elements
-  altGlyph = creator('altGlyph');
-  altGlyphDef = creator('altGlyphDef');
-  altGlyphItem = creator('altGlyphItem');
-  animate = creator('animate');
-  animateColor = creator('animateColor');
-  animateMotion = creator('animateMotion');
-  animateTransform = creator('animateTransform');
-  circle = creator('circle');
-  clipPath = creator('clipPath');
-  colorProfile = creator('color-profile');
-  cursor = creator('cursor');
-  defs = creator('defs');
-  desc = creator('desc');
-  discard = creator('discard');
-  ellipse = creator('ellipse');
-  feBlend = creator('feBlend');
-  feColorMatrix = creator('feColorMatrix');
-  feComponentTransfer = creator('feComponentTransfer');
-  feComposite = creator('feComposite');
-  feConvolveMatrix = creator('feConvolveMatrix');
-  feDiffuseLighting = creator('feDiffuseLighting');
-  feDisplacementMap = creator('feDisplacementMap');
-  feDistantLight = creator('feDistantLight');
-  feDropShadow = creator('feDropShadow');
-  feFlood = creator('feFlood');
-  feFuncA = creator('feFuncA');
-  feFuncB = creator('feFuncB');
-  feFuncG = creator('feFuncG');
-  feFuncR = creator('feFuncR');
-  feGaussianBlur = creator('feGaussianBlur');
-  feImage = creator('feImage');
-  feMerge = creator('feMerge');
-  feMergeNode = creator('feMergeNode');
-  feMorphology = creator('feMorphology');
-  feOffset = creator('feOffset');
-  fePointLight = creator('fePointLight');
-  feSpecularLighting = creator('feSpecularLighting');
-  feSpotLight = creator('feSpotLight');
-  feTile = creator('feTile');
-  feTurbulence = creator('feTurbulence');
-  filter = creator('filter');
-  font = creator('font');
-  fontFace = creator('font-face');
-  fontFaceFormat = creator('font-face-format');
-  fontFaceName = creator('font-face-name');
-  fontFaceSrc = creator('font-face-src');
-  fontFaceUri = creator('font-face-uri');
-  foreignObject = creator('foreignObject');
-  g = creator('g');
-  glyph = creator('glyph');
-  glyphRef = creator('glyphRef');
-  hatch = creator('hatch');
-  hatchpath = creator('hatchpath');
-  hkern = creator('hkern');
-  image = creator('image');
-  line = creator('line');
-  linearGradient = creator('linearGradient');
-  marker = creator('marker');
-  mask = creator('mask');
-  mesh = creator('mesh');
-  meshgradient = creator('meshgradient');
-  meshpatch = creator('meshpatch');
-  meshrow = creator('meshrow');
-  metadata = creator('metadata');
-  missingGlyph = creator('missing-glyph');
-  mpath = creator('mpath');
-  path = creator('path');
-  pattern = creator('pattern');
-  polygon = creator('polygon');
-  polyline = creator('polyline');
-  radialGradient = creator('radialGradient');
-  rect = creator('rect');
-  svgSet = creator('set');
-  solidcolor = creator('solidcolor');
-  stop = creator('stop');
-  svg = creator('svg');
-  svgSwitch = creator('switch');
-  symbol = creator('symbol');
-  text = creator('text');
-  textPath = creator('textPath');
-  tref = creator('tref');
-  tspan = creator('tspan');
-  unknown = creator('unknown');
-  use = creator('use');
-  view = creator('view');
-  vkern = creator('vkern');
-}
diff --git a/lib/react_client/bridge.dart b/lib/react_client/bridge.dart
index d434f598..d7abc3b1 100644
--- a/lib/react_client/bridge.dart
+++ b/lib/react_client/bridge.dart
@@ -3,7 +3,6 @@ import 'package:meta/meta.dart';
 import 'package:react/react.dart';
 import 'package:react/react_client/js_backed_map.dart';
 import 'package:react/react_client/react_interop.dart';
-import 'package:react/src/prop_validator.dart';
 import 'package:react/src/typedefs.dart';
 
 /// A function that returns a bridge instance for use with a given [component].
@@ -33,14 +32,14 @@ abstract class Component2Bridge {
   ///
   /// Protected; use [forComponent] instead.
   @protected
-  static final Expando<Component2Bridge> bridgeForComponent = new Expando();
+  static final Expando<Component2Bridge> bridgeForComponent = Expando();
 
   const Component2Bridge();
 
   /// Returns the bridge instance associated with the given [component].
   ///
   /// This will only be available for components that are instantiated by the
-  /// [ReactDartComponentFactoryProxy2], and not when manually instantiated.
+  /// `ReactDartComponentFactoryProxy2`, and not when manually instantiated.
   ///
   /// __For internal/advanced use only.__
   static Component2Bridge forComponent(Component2 component) => bridgeForComponent[component];
@@ -63,6 +62,7 @@ class Component2BridgeImpl extends Component2Bridge {
   /// Returns a const bridge instance suitable for use with any component.
   ///
   /// See [Component2BridgeFactory] for more info.
+  // ignore: prefer_constructors_over_static_methods
   static Component2BridgeImpl bridgeFactory(Component2 _) => const Component2BridgeImpl();
 
   @override
@@ -79,7 +79,7 @@ class Component2BridgeImpl extends Component2Bridge {
     // Short-circuit to match the ReactJS 16 behavior of not re-rendering the component if newState is null.
     if (newState == null) return;
 
-    dynamic firstArg = jsBackingMapOrJsCopy(newState);
+    final firstArg = jsBackingMapOrJsCopy(newState);
 
     if (callback == null) {
       component.jsThis.setState(firstArg);
@@ -94,8 +94,8 @@ class Component2BridgeImpl extends Component2Bridge {
   void setStateWithUpdater(Component2 component, StateUpdaterCallback stateUpdater, SetStateCallback callback) {
     final firstArg = allowInterop((JsMap jsPrevState, JsMap jsProps, [_]) {
       final value = stateUpdater(
-        new JsBackedMap.backedBy(jsPrevState),
-        new JsBackedMap.backedBy(jsProps),
+        JsBackedMap.backedBy(jsPrevState),
+        JsBackedMap.backedBy(jsProps),
       );
       if (value == null) return null;
       return jsBackingMapOrJsCopy(value);
@@ -125,9 +125,9 @@ class Component2BridgeImpl extends Component2Bridge {
         String secret,
       ) {
         // Create a Dart consumable version of the JsMap.
-        var convertedProps = JsBackedMap.fromJs(props);
+        final convertedProps = JsBackedMap.fromJs(props);
         // Call the users validator with the newly wrapped props.
-        var error = validator(
+        final error = validator(
             convertedProps,
             PropValidatorInfo(
               propName: propName,
diff --git a/lib/react_client/component_factory.dart b/lib/react_client/component_factory.dart
index 584d9700..9f727e2e 100644
--- a/lib/react_client/component_factory.dart
+++ b/lib/react_client/component_factory.dart
@@ -10,7 +10,6 @@ import 'package:react/react_client.dart';
 import 'package:react/react_client/js_backed_map.dart';
 import 'package:react/react_client/react_interop.dart';
 
-import 'package:react/src/context.dart';
 import 'package:react/src/ddc_emulated_function_name_bug.dart' as ddc_emulated_function_name_bug;
 import 'package:react/src/js_interop_util.dart';
 import 'package:react/src/typedefs.dart';
@@ -20,7 +19,7 @@ import 'package:react/src/react_client/factory_util.dart';
 export 'package:react/src/react_client/factory_util.dart' show generateJsProps, unconvertJsEventHandler;
 
 /// Prepares [children] to be passed to the ReactJS [React.createElement] and
-/// the Dart [react.Component].
+/// the Dart [Component2].
 ///
 /// Currently only involves converting a top-level non-[List] [Iterable] to
 /// a non-growable [List], but this may be updated in the future to support
@@ -43,7 +42,7 @@ dynamic listifyChildren(dynamic children) {
 /// If `style` is specified in props, then it too is shallow-converted and included
 /// in the returned Map.
 Map unconvertJsProps(/* ReactElement|ReactComponent */ instance) {
-  var props = Map.from(JsBackedMap.backedBy(instance.props));
+  final props = Map.from(JsBackedMap.backedBy(instance.props as JsMap));
 
   // Catch if a Dart component has been passed in. Component (version 1) can be identified by having the "internal"
   // prop. Component2, however, does not have that but can be detected by checking whether or not the style prop is a
@@ -51,13 +50,13 @@ Map unconvertJsProps(/* ReactElement|ReactComponent */ instance) {
   // it is a Dart Component.
   // ignore: deprecated_member_use_from_same_package
   if (props['internal'] is ReactDartComponentInternal || (props['style'] != null && props['style'] is Map)) {
-    throw new ArgumentError('A Dart Component cannot be passed into unconvertJsProps.');
+    throw ArgumentError('A Dart Component cannot be passed into unconvertJsProps.');
   }
 
   // Convert the nested style map so it can be read by Dart code.
-  var style = props['style'];
+  final style = props['style'];
   if (style != null) {
-    props['style'] = Map<String, dynamic>.from(JsBackedMap.backedBy(style));
+    props['style'] = Map<String, dynamic>.from(JsBackedMap.backedBy(style as JsMap));
   }
 
   return props;
@@ -67,8 +66,8 @@ Map unconvertJsProps(/* ReactElement|ReactComponent */ instance) {
 mixin JsBackedMapComponentFactoryMixin on ReactComponentFactoryProxy {
   @override
   ReactElement build(Map props, [List childrenArgs = const []]) {
-    var children = generateChildren(childrenArgs, shouldAlwaysBeList: true);
-    var convertedProps = generateExtendedJsProps(props);
+    final children = generateChildren(childrenArgs, shouldAlwaysBeList: true);
+    final convertedProps = generateExtendedJsProps(props);
     return React.createElement(type, convertedProps, children);
   }
 
@@ -88,13 +87,12 @@ class ReactDartComponentFactoryProxy<TComponent extends Component> extends React
   /// into [generateExtendedJsProps] upon [ReactElement] creation.
   final Map defaultProps;
 
-  ReactDartComponentFactoryProxy(ReactClass reactClass)
-      : this.reactClass = reactClass,
-        this.defaultProps = reactClass.dartDefaultProps;
+  ReactDartComponentFactoryProxy(this.reactClass) : defaultProps = reactClass.dartDefaultProps;
 
   @override
   ReactClass get type => reactClass;
 
+  @override
   ReactElement build(Map props, [List childrenArgs = const []]) {
     var children = convertArgsToChildren(childrenArgs);
     children = listifyChildren(children);
@@ -116,7 +114,7 @@ class ReactDartComponentFactoryProxy<TComponent extends Component> extends React
     // 3. Remove "reserved" props that should not be visible to the rendered component.
 
     // [1]
-    Map extendedProps = (defaultProps != null ? new Map.from(defaultProps) : {})
+    final extendedProps = (defaultProps != null ? Map.from(defaultProps) : {})
       // [2]
       ..addAll(props)
       ..['children'] = children
@@ -124,9 +122,9 @@ class ReactDartComponentFactoryProxy<TComponent extends Component> extends React
       ..remove('key')
       ..remove('ref');
 
-    var internal = new ReactDartComponentInternal()..props = extendedProps;
+    final internal = ReactDartComponentInternal()..props = extendedProps;
 
-    var interopProps = new InteropProps(internal: internal);
+    final interopProps = InteropProps(internal: internal);
 
     // Don't pass a key into InteropProps if one isn't defined, so that the value will
     // be `undefined` in the JS, which is ignored by React, whereas `null` isn't.
@@ -135,7 +133,7 @@ class ReactDartComponentFactoryProxy<TComponent extends Component> extends React
     }
 
     if (props.containsKey('ref')) {
-      var ref = props['ref'];
+      final ref = props['ref'];
 
       // If the ref is a callback, pass ReactJS a function that will call it
       // with the Dart Component instance, not the ReactComponent instance.
@@ -143,6 +141,7 @@ class ReactDartComponentFactoryProxy<TComponent extends Component> extends React
       // Use CallbackRef<Null> to check arity, since parameters could be non-dynamic, and thus
       // would fail the `is CallbackRef<dynamic>` check.
       // See https://github.com/dart-lang/sdk/issues/34593 for more information on arity checks.
+      // ignore: prefer_void_to_null
       if (ref is CallbackRef<Null>) {
         interopProps.ref = allowInterop((dynamic instance) {
           // Call as dynamic to perform dynamic dispatch, since we can't cast to CallbackRef<dynamic>,
@@ -175,13 +174,13 @@ class ReactDartComponentFactoryProxy2<TComponent extends Component2> extends Rea
         ReactDartComponentFactoryProxy {
   /// The ReactJS class used as the type for all [ReactElement]s built by
   /// this factory.
+  @override
   final ReactClass reactClass;
 
+  @override
   final Map defaultProps;
 
-  ReactDartComponentFactoryProxy2(ReactClass reactClass)
-      : this.reactClass = reactClass,
-        this.defaultProps = new JsBackedMap.fromJs(reactClass.defaultProps);
+  ReactDartComponentFactoryProxy2(this.reactClass) : defaultProps = JsBackedMap.fromJs(reactClass.defaultProps);
 
   @override
   ReactClass get type => reactClass;
@@ -200,14 +199,15 @@ class ReactJsContextComponentFactoryProxy extends ReactJsComponentFactoryProxy {
   final ReactClass type;
   final bool isConsumer;
   final bool isProvider;
+  @override
   final bool shouldConvertDomProps;
 
   ReactJsContextComponentFactoryProxy(
     ReactClass jsClass, {
-    this.shouldConvertDomProps: true,
-    this.isConsumer: false,
-    this.isProvider: false,
-  })  : this.type = jsClass,
+    this.shouldConvertDomProps = true,
+    this.isConsumer = false,
+    this.isProvider = false,
+  })  : type = jsClass,
         super(jsClass, shouldConvertDomProps: shouldConvertDomProps);
 
   @override
@@ -216,7 +216,7 @@ class ReactJsContextComponentFactoryProxy extends ReactJsComponentFactoryProxy {
 
     if (isConsumer) {
       if (children is Function) {
-        Function contextCallback = children;
+        final contextCallback = children as Function;
         children = allowInterop((args) {
           return contextCallback(ContextHelpers.unjsifyNewContext(args));
         });
@@ -229,7 +229,7 @@ class ReactJsContextComponentFactoryProxy extends ReactJsComponentFactoryProxy {
   /// Returns a JavaScript version of the specified [props], preprocessed for consumption by ReactJS and prepared for
   /// consumption by the `react` library internals.
   JsMap generateExtendedJsProps(Map props) {
-    JsBackedMap propsForJs = new JsBackedMap.from(props);
+    final propsForJs = JsBackedMap.from(props);
 
     if (isProvider) {
       propsForJs['value'] = ContextHelpers.jsifyNewContext(propsForJs['value']);
@@ -261,21 +261,21 @@ class ReactJsComponentFactoryProxy extends ReactComponentFactoryProxy {
 
   ReactJsComponentFactoryProxy(
     ReactClass jsClass, {
-    this.shouldConvertDomProps: true,
-    this.alwaysReturnChildrenAsList: false,
+    this.shouldConvertDomProps = true,
+    this.alwaysReturnChildrenAsList = false,
     List<String> additionalRefPropKeys = const [],
-  })  : this.type = jsClass,
-        this._additionalRefPropKeys = additionalRefPropKeys {
+  })  : type = jsClass,
+        _additionalRefPropKeys = additionalRefPropKeys {
     if (jsClass == null) {
-      throw new ArgumentError('`jsClass` must not be null. '
+      throw ArgumentError('`jsClass` must not be null. '
           'Ensure that the JS component class you\'re referencing is available and being accessed correctly.');
     }
   }
 
   @override
   ReactElement build(Map props, [List childrenArgs]) {
-    dynamic children = generateChildren(childrenArgs, shouldAlwaysBeList: alwaysReturnChildrenAsList);
-    JsMap convertedProps =
+    final children = generateChildren(childrenArgs, shouldAlwaysBeList: alwaysReturnChildrenAsList);
+    final convertedProps =
         generateJsProps(props, convertCallbackRefValue: false, additionalRefPropKeys: _additionalRefPropKeys);
     return React.createElement(type, convertedProps, children);
   }
@@ -300,8 +300,8 @@ class ReactDomComponentFactoryProxy extends ReactComponentFactoryProxy {
 
   @override
   ReactElement build(Map props, [List childrenArgs = const []]) {
-    var children = generateChildren(childrenArgs);
-    var convertedProps = generateJsProps(props, convertCallbackRefValue: false, wrapWithJsify: true);
+    final children = generateChildren(childrenArgs);
+    final convertedProps = generateJsProps(props, convertCallbackRefValue: false, wrapWithJsify: true);
     return React.createElement(type, convertedProps, children);
   }
 
@@ -320,9 +320,9 @@ class ReactDartFunctionComponentFactoryProxy extends ReactComponentFactoryProxy
   final JsFunctionComponent reactFunction;
 
   ReactDartFunctionComponentFactoryProxy(DartFunctionComponent dartFunctionComponent, {String displayName})
-      : this.displayName = displayName ?? _getJsFunctionName(dartFunctionComponent),
-        this.reactFunction = _wrapFunctionComponent(dartFunctionComponent,
-            displayName: displayName ?? _getJsFunctionName(dartFunctionComponent));
+      : displayName = displayName ?? getJsFunctionName(dartFunctionComponent),
+        reactFunction = _wrapFunctionComponent(dartFunctionComponent,
+            displayName: displayName ?? getJsFunctionName(dartFunctionComponent));
 
   @override
   JsFunctionComponent get type => reactFunction;
@@ -338,12 +338,10 @@ class ReactDartWrappedComponentFactoryProxy extends ReactComponentFactoryProxy w
 
   ReactDartWrappedComponentFactoryProxy.forwardRef(DartForwardRefFunctionComponent dartFunctionComponent,
       {String displayName})
-      : this.type = _wrapForwardRefFunctionComponent(dartFunctionComponent,
-            displayName: displayName ?? _getJsFunctionName(dartFunctionComponent));
+      : type = _wrapForwardRefFunctionComponent(dartFunctionComponent,
+            displayName: displayName ?? getJsFunctionName(dartFunctionComponent));
 }
 
-String _getJsFunctionName(Function object) => getProperty(object, 'name') ?? getProperty(object, '\$static_name');
-
 /// Creates a function component from the given [dartFunctionComponent] that can be used with React.
 ///
 /// [displayName] Sets the component name for debugging purposes.
@@ -357,8 +355,10 @@ JsFunctionComponent _wrapFunctionComponent(DartFunctionComponent dartFunctionCom
   // to force `null` as the return value if user returns a Dart `null`.
   // See: https://github.com/dart-lang/sdk/issues/27485
   jsFunctionComponent(JsMap jsProps, [JsMap _legacyContext]) =>
+      // ignore: invalid_use_of_visible_for_testing_member
       componentZone.run(() => dartFunctionComponent(JsBackedMap.backedBy(jsProps)) ?? jsNull);
-  JsFunctionComponent interopFunction = allowInterop(jsFunctionComponent);
+  // ignore: omit_local_variable_types
+  final JsFunctionComponent interopFunction = allowInterop(jsFunctionComponent);
   if (displayName != null) {
     // This is a work-around to display the correct name in the React DevTools and error boundary component stacks.
     defineProperty(interopFunction, 'name', JsPropertyDescriptor(value: displayName));
@@ -382,6 +382,7 @@ ReactClass _wrapForwardRefFunctionComponent(DartForwardRefFunctionComponent dart
   // to force `null` as the return value if user returns a Dart `null`.
   // See: https://github.com/dart-lang/sdk/issues/27485
   jsFunctionComponent(JsMap props, dynamic ref) =>
+      // ignore: invalid_use_of_visible_for_testing_member
       componentZone.run(() => dartFunctionComponent(JsBackedMap.backedBy(props), ref) ?? jsNull);
 
   final interopFunction = allowInterop(jsFunctionComponent);
diff --git a/lib/react_client/js_backed_map.dart b/lib/react_client/js_backed_map.dart
index 8dd20b22..717af30d 100644
--- a/lib/react_client/js_backed_map.dart
+++ b/lib/react_client/js_backed_map.dart
@@ -26,16 +26,16 @@ class JsBackedMap extends MapBase<dynamic, dynamic> {
   final JsMap jsObject;
 
   /// Creates a JsBackedMap instance backed by a new [jsObject].
-  JsBackedMap() : jsObject = new JsMap();
+  JsBackedMap() : jsObject = JsMap();
 
   /// Creates a JsBackedMap instance backed by [jsObject].
   JsBackedMap.backedBy(this.jsObject);
 
   /// Creates a JsBackedMap instance that contains all key/value pairs of [other].
-  factory JsBackedMap.from(Map other) => new JsBackedMap()..addAll(other);
+  factory JsBackedMap.from(Map other) => JsBackedMap()..addAll(other);
 
   /// Creates a JsBackedMap instance that contains all key/value pairs of the JS object [jsOther].
-  factory JsBackedMap.fromJs(JsMap jsOther) => new JsBackedMap()..addAllFromJs(jsOther);
+  factory JsBackedMap.fromJs(JsMap jsOther) => JsBackedMap()..addAllFromJs(jsOther);
 
   // Private helpers with narrower typing than we want to expose, for use in other methods
   List<dynamic> get _keys => _Object.keys(jsObject);
@@ -79,7 +79,7 @@ class JsBackedMap extends MapBase<dynamic, dynamic> {
 
   @override
   void clear() {
-    for (var key in _keys) {
+    for (final key in _keys) {
       _Reflect.deleteProperty(jsObject, key);
     }
   }
@@ -150,7 +150,7 @@ JsMap jsBackingMapOrJsCopy(Map map) {
   if (map is JsBackedMap) {
     return map.jsObject;
   } else {
-    return new JsBackedMap.from(map).jsObject;
+    return JsBackedMap.from(map).jsObject;
   }
 }
 
@@ -158,7 +158,6 @@ JsMap jsBackingMapOrJsCopy(Map map) {
 abstract class _Object {
   external static void assign(JsMap to, JsMap from);
   external static List<dynamic> keys(JsMap object);
-  external static List<dynamic> values(JsMap object);
 }
 
 @JS('Reflect')
diff --git a/lib/react_client/js_interop_helpers.dart b/lib/react_client/js_interop_helpers.dart
index c76d4412..37a9d527 100644
--- a/lib/react_client/js_interop_helpers.dart
+++ b/lib/react_client/js_interop_helpers.dart
@@ -4,9 +4,10 @@
 library react_client.js_interop_helpers;
 
 import 'dart:collection';
-import "dart:js_util";
+import 'dart:js_util';
 
-import "package:js/js.dart";
+import 'package:js/js.dart';
+import 'package:react/react_client/react_interop.dart' show forwardRef2;
 
 import 'js_backed_map.dart';
 
@@ -75,7 +76,7 @@ int _anonymousJsObjectOrFrozenObjectHashCode(Object _) => 0;
 /// methods in this library. Only use this method as a last resort.
 ///
 /// Recursively converts a JSON-like collection of Dart objects to a
-/// collection of JavaScript objects and returns a [JsObject] proxy to it.
+/// collection of JavaScript objects and returns a `JsObject` proxy to it.
 ///
 /// [object] must be a [Map] or [Iterable], the contents of which are also
 /// converted. Maps and Iterables are copied to a new JavaScript object.
@@ -83,7 +84,7 @@ int _anonymousJsObjectOrFrozenObjectHashCode(Object _) => 0;
 /// JavaScript type, and all other objects are proxied.
 dynamic jsifyAndAllowInterop(object) {
   if (object is! Map && object is! Iterable) {
-    throw new ArgumentError.value(object, 'object', 'must be a Map or Iterable');
+    throw ArgumentError.value(object, 'object', 'must be a Map or Iterable');
   }
   return _convertDataTree(object);
 }
@@ -100,7 +101,7 @@ _convertDataTree(data) {
     if (o is Map) {
       final convertedMap = newObject();
       _convertedObjects[o] = convertedMap;
-      for (var key in o.keys) {
+      for (final key in o.keys) {
         setProperty(convertedMap, key, _convert(o[key]));
       }
       return convertedMap;
@@ -123,5 +124,5 @@ _convertDataTree(data) {
 
 /// Keeps track of functions found when converting JS props to Dart props.
 ///
-/// See: [forwardRef] for usage / context.
+/// See: [forwardRef2] for usage / context.
 final isRawJsFunctionFromProps = Expando<bool>();
diff --git a/lib/react_client/react_interop.dart b/lib/react_client/react_interop.dart
index 8463749d..d765bbaa 100644
--- a/lib/react_client/react_interop.dart
+++ b/lib/react_client/react_interop.dart
@@ -1,4 +1,3 @@
-// ignore_for_file: deprecated_member_use_from_same_package
 /// JS interop classes for main React JS APIs and react-dart internals.
 ///
 /// For use in `react_client.dart` and by advanced react-dart users.
@@ -15,7 +14,6 @@ import 'package:js/js_util.dart';
 import 'package:meta/meta.dart';
 import 'package:react/hooks.dart';
 import 'package:react/react.dart';
-import 'package:react/react_client.dart' show ComponentFactory;
 import 'package:react/react_client/bridge.dart';
 import 'package:react/react_client/js_backed_map.dart';
 import 'package:react/react_client/component_factory.dart'
@@ -25,8 +23,8 @@ import 'package:react/react_client/zone.dart';
 import 'package:react/src/js_interop_util.dart';
 import 'package:react/src/react_client/dart2_interop_workaround_bindings.dart';
 
-typedef ReactElement ReactJsComponentFactory(props, children);
-typedef dynamic JsPropValidator(
+typedef ReactJsComponentFactory = ReactElement Function(dynamic props, dynamic children);
+typedef JsPropValidator = dynamic Function(
     JsMap props, String propName, String componentName, String location, String propFullName, String secret);
 
 // ----------------------------------------------------------------------------
@@ -88,7 +86,7 @@ abstract class React {
 ///
 /// Learn more: <https://reactjs.org/docs/refs-and-the-dom.html#creating-refs>.
 Ref<T> createRef<T>() {
-  return new Ref<T>();
+  return Ref<T>();
 }
 
 /// When this is provided as the ref prop, a reference to the rendered component
@@ -123,7 +121,7 @@ class Ref<T> {
         return dartCurrent as T;
       }
     }
-    return jsCurrent;
+    return jsCurrent as T;
   }
 
   /// Sets the value of [current].
@@ -241,9 +239,10 @@ ReactJsComponentFactoryProxy forwardRef(
   Function(Map props, Ref ref) wrapperFunction, {
   String displayName = 'Anonymous',
 }) {
-  final wrappedComponent = allowInterop((JsMap props, JsRef ref) => componentZone.run(() {
+  // ignore: invalid_use_of_visible_for_testing_member
+  final wrappedComponent = allowInterop((JsMap props, ref) => componentZone.run(() {
         final dartProps = JsBackedMap.backedBy(props);
-        for (var value in dartProps.values) {
+        for (final value in dartProps.values) {
           if (value is Function) {
             // Tag functions that came straight from the JS
             // so that we know to pass them through as-is during prop conversion.
@@ -251,12 +250,12 @@ ReactJsComponentFactoryProxy forwardRef(
           }
         }
 
-        final dartRef = Ref.fromJs(ref);
+        final dartRef = Ref.fromJs(ref as JsRef);
         return wrapperFunction(dartProps, dartRef);
       }));
   defineProperty(wrappedComponent, 'displayName', JsPropertyDescriptor(value: displayName));
 
-  var hoc = React.forwardRef(wrappedComponent);
+  final hoc = React.forwardRef(wrappedComponent);
   // ignore: invalid_use_of_protected_member
   setProperty(hoc, 'dartComponentVersion', ReactDartComponentVersion.component2);
 
@@ -375,7 +374,7 @@ abstract class PropTypes {
 /// To be used as the value of [ReactElement.type], which is set upon initialization
 /// by a component factory or by [React.createElement].
 ///
-/// See: <http://facebook.github.io/react/docs/top-level-api.html#react.createclass>
+/// See: <https://reactjs.org/docs/react-api.html#components>
 @JS()
 @anonymous
 class ReactClass {
@@ -389,14 +388,14 @@ class ReactClass {
 
   /// The `displayName` string is used in debugging messages.
   ///
-  /// See: <http://facebook.github.io/react/docs/component-specs.html#displayname>
+  /// See: <https://reactjs.org/docs/react-component.html#displayname>
   external String get displayName;
   external set displayName(String value);
 
   /// The cached, unmodifiable copy of [Component.getDefaultProps] computed in
   /// [registerComponent].
   ///
-  /// For use in [ReactDartComponentFactoryProxy] when creating new [ReactElement]s,
+  /// For use in `ReactDartComponentFactoryProxy` when creating new [ReactElement]s,
   /// or for external use involving inspection of Dart prop defaults.
   @Deprecated('7.0.0`')
   external Map get dartDefaultProps;
@@ -439,7 +438,7 @@ abstract class ReactDartComponentVersion {
       return type.dartComponentVersion;
     }
     if (type is Function) {
-      return getProperty(type, 'dartComponentVersion');
+      return getProperty(type, 'dartComponentVersion') as String;
     }
 
     return null;
@@ -448,7 +447,7 @@ abstract class ReactDartComponentVersion {
 
 /// A JS interop class used as an argument to [React.createClass].
 ///
-/// See: <http://facebook.github.io/react/docs/top-level-api.html#react.createclass>.
+/// See: <https://reactjs.org/docs/react-api.html#components>.
 ///
 /// > __DEPRECATED.__
 /// >
@@ -476,7 +475,7 @@ class ReactClassConfig {
 
   /// The `displayName` string is used in debugging messages.
   ///
-  /// See: <http://facebook.github.io/react/docs/component-specs.html#displayname>
+  /// See: <https://reactjs.org/docs/react-component.html#displayname>
   external String get displayName;
   external set displayName(String value);
 }
@@ -556,7 +555,7 @@ class ReactPortal {
 
 /// The JavaScript component instance, which backs each react-dart [Component].
 ///
-/// See: <http://facebook.github.io/react/docs/glossary.html#react-components>
+/// See: <https://reactjs.org/docs/glossary.html#react-components>
 @JS()
 @anonymous
 class ReactComponent {
@@ -720,12 +719,12 @@ external void markChildValidated(child);
 ///
 /// ___Only for use with variadic children.___
 void markChildrenValidated(List<dynamic> children) {
-  children.forEach((dynamic child) {
+  for (final child in children) {
     // Use `isValidElement` since `is ReactElement` doesn't behave as expected.
     if (React.isValidElement(child)) {
       markChildValidated(child);
     }
-  });
+  }
 }
 
 /// Returns a new JS [ReactClass] for a component that uses
@@ -813,9 +812,9 @@ class ComponentStatics {
 /// An object that stores static methods and information for a specific component class.
 ///
 /// This object is made accessible to a component's JS ReactClass config, which
-/// passes it to certain methods in [ReactDartInteropStatics2].
+/// passes it to certain methods in `ReactDartInteropStatics2`.
 ///
-/// See [ReactDartInteropStatics2], [createReactDartComponentClass2].
+/// See `ReactDartInteropStatics2`, [createReactDartComponentClass2].
 class ComponentStatics2 {
   final ComponentFactory<Component2> componentFactory;
   final Component2 instanceForStaticMethods;
@@ -855,10 +854,10 @@ class JsComponentConfig {
 @anonymous
 class JsComponentConfig2 {
   external factory JsComponentConfig2({
+    @required List<String> skipMethods,
     dynamic contextType,
     JsMap defaultProps,
     JsMap propTypes,
-    @required List<String> skipMethods,
   });
 }
 
@@ -874,5 +873,5 @@ class ReactErrorInfo {
 
   /// The dart stack trace associated with this error.
   external StackTrace get dartStackTrace;
-  external set dartStackTrace(StackTrace);
+  external set dartStackTrace(StackTrace value);
 }
diff --git a/lib/react_dom.dart b/lib/react_dom.dart
index 68ac7311..c4591a0f 100644
--- a/lib/react_dom.dart
+++ b/lib/react_dom.dart
@@ -9,13 +9,13 @@ import 'package:react/react.dart' show Component;
 import 'package:react/react_client/react_interop.dart' show ReactDom;
 import 'package:react/src/react_client/private_utils.dart' show validateJsApiThenReturn;
 
-/// Renders a ReactElement into the DOM in the supplied [container] and return a reference to the [component]
+/// Renders a `ReactElement` into the DOM in the supplied `container` and returns a reference to the component
 /// (or returns null for stateless components).
 ///
-/// If the ReactElement was previously rendered into the [container], this will perform an update on it and only
+/// If the `ReactElement` was previously rendered into the `container`, this will perform an update on it and only
 /// mutate the DOM as necessary to reflect the latest React component.
 ///
-/// TODO: Is there any reason to omit the [ReactElement] type for [component] or the [Element] type for [container]?
+/// TODO: Is there any reason to omit the `ReactElement` type for `component` or the `Element` type for `container`?
 Function render = validateJsApiThenReturn(() => ReactDom.render);
 
 /// Removes a mounted React component from the DOM and cleans up its event handlers and state.
@@ -23,7 +23,7 @@ Function render = validateJsApiThenReturn(() => ReactDom.render);
 /// > Returns `false` if no component was mounted in the container specified via [render], otherwise returns `true`.
 Function unmountComponentAtNode = validateJsApiThenReturn(() => ReactDom.unmountComponentAtNode);
 
-/// If the component has been mounted into the DOM, this returns the corresponding native browser DOM [Element].
+/// If the component has been mounted into the DOM, this returns the corresponding native browser DOM `Element`.
 Function findDOMNode = validateJsApiThenReturn(() => _findDomNode);
 
 dynamic _findDomNode(component) {
diff --git a/lib/react_test_utils.dart b/lib/react_test_utils.dart
index 0c00efd9..6642d672 100644
--- a/lib/react_test_utils.dart
+++ b/lib/react_test_utils.dart
@@ -38,7 +38,7 @@ import 'package:react/src/react_test_utils/simulate_wrappers.dart' as sw;
 /// * For custom composite components React.createClass()-based components, this will return the [ReactClass].
 dynamic getComponentTypeV2(ReactComponentFactoryProxy componentFactory) => componentFactory.type;
 
-typedef bool ComponentTestFunction(/* [1] */ component);
+typedef ComponentTestFunction = bool Function(dynamic /* [1] */ component);
 
 dynamic _jsifyEventData(Map eventData) => jsifyAndAllowInterop(eventData ?? const {});
 
@@ -50,7 +50,7 @@ dynamic _jsifyEventData(Map eventData) => jsifyAndAllowInterop(eventData ?? cons
 ///   Simulate.{eventName}(Element node, [Map] eventData)
 ///
 /// This should include all events documented at:
-/// http://facebook.github.io/react/docs/events.html
+/// https://reactjs.org/docs/events.html
 class Simulate {
   static void animationEnd(/* [1] */ node, [Map eventData]) =>
       sw.Simulate.animationEnd(node, _jsifyEventData(eventData));
@@ -216,7 +216,7 @@ external ReactClass mockComponent(ReactClass componentClass, String mockTagName)
 
 /// Returns a ReactShallowRenderer instance
 ///
-/// More info on using shallow rendering: https://facebook.github.io/react/docs/test-utils.html#shallow-rendering
+/// More info on using shallow rendering: https://reactjs.org/docs/test-renderer.html
 @JS('React.addons.TestUtils.createRenderer')
 external ReactShallowRenderer createRenderer();
 
diff --git a/lib/src/context.dart b/lib/src/context.dart
index f23102a1..b5692b67 100644
--- a/lib/src/context.dart
+++ b/lib/src/context.dart
@@ -108,14 +108,16 @@ Context<TValue> createContext<TValue>([
 ]) {
   int jsifyCalculateChangedBitsArgs(currentValue, nextValue) {
     return calculateChangedBits(
-        ContextHelpers.unjsifyNewContext(currentValue), ContextHelpers.unjsifyNewContext(nextValue));
+      ContextHelpers.unjsifyNewContext(currentValue) as TValue,
+      ContextHelpers.unjsifyNewContext(nextValue) as TValue,
+    );
   }
 
-  var JSContext = React.createContext(ContextHelpers.jsifyNewContext(defaultValue),
+  final JSContext = React.createContext(ContextHelpers.jsifyNewContext(defaultValue),
       calculateChangedBits != null ? allowInterop(jsifyCalculateChangedBitsArgs) : null);
   return Context(
-    new ReactJsContextComponentFactoryProxy(JSContext.Provider, isProvider: true),
-    new ReactJsContextComponentFactoryProxy(JSContext.Consumer, isConsumer: true),
+    ReactJsContextComponentFactoryProxy(JSContext.Provider, isProvider: true),
+    ReactJsContextComponentFactoryProxy(JSContext.Consumer, isConsumer: true),
     JSContext,
   );
 }
@@ -131,7 +133,7 @@ abstract class ContextHelpers {
   // Wraps context value in a JS Object for use on the JS side.
   // It is wrapped so that the same Dart value can be retrieved from Dart with [_unjsifyNewContext].
   static dynamic jsifyNewContext(dynamic context) {
-    var jsContextHolder = newObject();
+    final jsContextHolder = newObject();
     setProperty(jsContextHolder, _reactDartContextSymbol, DartValueWrapper.wrapIfNeeded(context));
     return jsContextHolder;
   }
diff --git a/lib/src/ddc_emulated_function_name_bug.dart b/lib/src/ddc_emulated_function_name_bug.dart
index 7b8e1192..4fb3b6f4 100644
--- a/lib/src/ddc_emulated_function_name_bug.dart
+++ b/lib/src/ddc_emulated_function_name_bug.dart
@@ -1,13 +1,13 @@
 /// Provides detection and patching of the bug described in <https://github.com/dart-lang/sdk/issues/27647>,
-/// in which getters/setters with the identifier `name` don't work for emulated function classes, like [UiProps].
+/// in which getters/setters with the identifier `name` don't work for emulated function classes, like `UiProps`.
 @JS()
 library react.ddc_emulated_function_name_bug;
 
 import 'package:js/js.dart';
 
-/// Create a reduced test case of the issue, using an emulated function pattern that is similar to [UiProps].
+/// Create a reduced test case of the issue, using an emulated function pattern that is similar to `UiProps`.
 ///
-/// We can't use [UiProps] itself, since it uses [isBugPresent], and that would cause a cyclic initialization error.
+/// We can't use `UiProps` itself, since it uses [isBugPresent], and that would cause a cyclic initialization error.
 class _NsmEmulatedFunctionWithNameProperty implements Function {
   void call();
 
@@ -29,7 +29,7 @@ class _NsmEmulatedFunctionWithNameProperty implements Function {
 final bool isBugPresent = (() {
   const testValue = 'test value';
 
-  var testObject = new _NsmEmulatedFunctionWithNameProperty();
+  final testObject = _NsmEmulatedFunctionWithNameProperty();
 
   try {
     // In the DDC, this throws:
@@ -69,11 +69,11 @@ external void _defineProperty(dynamic object, String propertyName, _PropertyDesc
 ///
 /// __This functionality is unstable, and should not be used when [isBugPresent] is `false`.__
 ///
-/// This method also had undefined behavior on non-[UiProps] instances.
+/// This method also had undefined behavior on non-`UiProps` instances.
 void patchName(dynamic object) {
   var current = object;
   while ((current = _getPrototypeOf(current)) != null) {
-    var nameDescriptor = _getOwnPropertyDescriptor(current, 'name');
+    final nameDescriptor = _getOwnPropertyDescriptor(current, 'name');
 
     if (nameDescriptor != null) {
       _defineProperty(object, 'name', nameDescriptor);
diff --git a/lib/src/js_interop_util.dart b/lib/src/js_interop_util.dart
index 6149b83c..9fe94d39 100644
--- a/lib/src/js_interop_util.dart
+++ b/lib/src/js_interop_util.dart
@@ -4,7 +4,6 @@ library js_interop_util;
 import 'dart:js_util';
 
 import 'package:js/js.dart';
-import 'package:react/react_client/js_backed_map.dart' show JsMap;
 
 @JS('Object.keys')
 external List<String> objectKeys(Object object);
@@ -18,14 +17,15 @@ class JsPropertyDescriptor {
 @JS('Object.defineProperty')
 external void defineProperty(dynamic object, String propertyName, JsPropertyDescriptor descriptor);
 
-String getJsFunctionName(Function object) => getProperty(object, 'name') ?? getProperty(object, '\$static_name');
+String getJsFunctionName(Function object) =>
+    (getProperty(object, 'name') ?? getProperty(object, '\$static_name')) as String;
 
 /// Creates JS `Promise` which is resolved when [future] completes.
 ///
 /// See also:
 /// - [promiseToFuture]
 Promise futureToPromise<T>(Future<T> future) {
-  return Promise(allowInterop((Function resolve, Function reject) {
+  return Promise(allowInterop((resolve, reject) {
     future.then((result) => resolve(result), onError: reject);
   }));
 }
diff --git a/lib/src/react_client/component_registration.dart b/lib/src/react_client/component_registration.dart
index 498962ac..198fc800 100644
--- a/lib/src/react_client/component_registration.dart
+++ b/lib/src/react_client/component_registration.dart
@@ -1,6 +1,5 @@
 import 'dart:html';
 
-import 'package:js/js_util.dart';
 import 'package:react/react.dart';
 import 'package:react/react_client/bridge.dart';
 import 'package:react/react_client/js_backed_map.dart';
@@ -20,8 +19,8 @@ import '../js_interop_util.dart';
 /// important ones. If an important lifecycle event was set for skipping, a
 /// warning is issued.
 List<String> _filterSkipMethods(Iterable<String> methods) {
-  List<String> finalList = List.from(methods);
-  bool shouldWarn = false;
+  final finalList = List.of(methods);
+  var shouldWarn = false;
 
   if (finalList.contains('shouldComponentUpdate')) {
     finalList.remove('shouldComponentUpdate');
@@ -39,41 +38,41 @@ List<String> _filterSkipMethods(Iterable<String> methods) {
   }
 
   if (shouldWarn) {
-    window.console.warn("WARNING: Crucial lifecycle methods passed into "
-        "skipMethods. shouldComponentUpdate, componentDidUpdate, and render "
-        "cannot be skipped and will still be added to the new component. Please "
-        "remove them from skipMethods.");
+    window.console.warn('WARNING: Crucial lifecycle methods passed into '
+        'skipMethods. shouldComponentUpdate, componentDidUpdate, and render '
+        'cannot be skipped and will still be added to the new component. Please '
+        'remove them from skipMethods.');
   }
 
   return finalList;
 }
 
 /// Creates and returns a new [ReactDartComponentFactoryProxy] from the provided [componentFactory]
-/// which produces a new JS [`ReactClass` component class](https://facebook.github.io/react/docs/top-level-api.html#react.createclass).
+/// which produces a new JS `ReactClass` component class.
 @Deprecated('7.0.0')
 ReactDartComponentFactoryProxy registerComponent(
   ComponentFactory componentFactory, [
   Iterable<String> skipMethods = const ['getDerivedStateFromError', 'componentDidCatch'],
 ]) {
   try {
-    var componentInstance = componentFactory();
+    final componentInstance = componentFactory();
 
     if (componentInstance is Component2) {
-      return registerComponent2(componentFactory, skipMethods: skipMethods);
+      return registerComponent2(() => componentFactory() as Component2, skipMethods: skipMethods);
     }
 
-    var componentStatics = new ComponentStatics(componentFactory);
+    final componentStatics = ComponentStatics(componentFactory);
 
-    var jsConfig = new JsComponentConfig(
+    final jsConfig = JsComponentConfig(
       childContextKeys: componentInstance.childContextKeys,
       contextKeys: componentInstance.contextKeys,
     );
 
     final displayName = componentInstance.displayName;
 
-    /// Create the JS [`ReactClass` component class](https://facebook.github.io/react/docs/top-level-api.html#react.createclass)
+    /// Create the JS `ReactClass` component class
     /// with custom JS lifecycle methods.
-    var reactComponentClass = createReactDartComponentClass(dartInteropStatics, componentStatics, jsConfig)
+    final reactComponentClass = createReactDartComponentClass(dartInteropStatics, componentStatics, jsConfig)
       // ignore: invalid_use_of_protected_member
       ..dartComponentVersion = ReactDartComponentVersion.component
       // This is redundant since we also set `name` below, but some code may depend on reading displayName
@@ -86,10 +85,10 @@ ReactDartComponentFactoryProxy registerComponent(
 
     // Cache default props and store them on the ReactClass so they can be used
     // by ReactDartComponentFactoryProxy and externally.
-    final Map defaultProps = new Map.unmodifiable(componentInstance.getDefaultProps());
+    final defaultProps = Map.unmodifiable(componentInstance.getDefaultProps());
     reactComponentClass.dartDefaultProps = defaultProps;
 
-    return new ReactDartComponentFactoryProxy(reactComponentClass);
+    return ReactDartComponentFactoryProxy(reactComponentClass);
   } catch (e, stack) {
     print('Error when registering Component: $e\n$stack');
     rethrow;
@@ -97,18 +96,18 @@ ReactDartComponentFactoryProxy registerComponent(
 }
 
 /// Creates and returns a new factory proxy from the provided [componentFactory]
-/// which produces a new JS [`ReactClass` component class](https://facebook.github.io/react/docs/top-level-api.html#react.createclass).
+/// which produces a new JS `ReactClass` component class.
 ReactDartComponentFactoryProxy2 registerComponent2(
   ComponentFactory<Component2> componentFactory, {
   Iterable<String> skipMethods = const ['getDerivedStateFromError', 'componentDidCatch'],
   Component2BridgeFactory bridgeFactory,
 }) {
-  bool errorPrinted = false;
+  var errorPrinted = false;
   try {
     bridgeFactory ??= Component2BridgeImpl.bridgeFactory;
 
     final componentInstance = componentFactory();
-    final componentStatics = new ComponentStatics2(
+    final componentStatics = ComponentStatics2(
       componentFactory: componentFactory,
       instanceForStaticMethods: componentInstance,
       bridgeFactory: bridgeFactory,
@@ -139,7 +138,7 @@ ReactDartComponentFactoryProxy2 registerComponent2(
       rethrow;
     }
 
-    var jsConfig2 = new JsComponentConfig2(
+    final jsConfig2 = JsComponentConfig2(
       defaultProps: defaultProps.jsObject,
       contextType: componentInstance.contextType?.jsThis,
       skipMethods: filteredSkipMethods,
@@ -148,9 +147,9 @@ ReactDartComponentFactoryProxy2 registerComponent2(
 
     final displayName = componentInstance.displayName;
 
-    /// Create the JS [`ReactClass` component class](https://facebook.github.io/react/docs/top-level-api.html#react.createclass)
+    /// Create the JS `ReactClass` component class
     /// with custom JS lifecycle methods.
-    var reactComponentClass =
+    final reactComponentClass =
         createReactDartComponentClass2(ReactDartInteropStatics2.staticsForJs, componentStatics, jsConfig2)
           // This is redundant since we also set `name` below, but some code may depend on reading displayName
           // so we'll leave this in place for now.
@@ -163,7 +162,7 @@ ReactDartComponentFactoryProxy2 registerComponent2(
     // ignore: invalid_use_of_protected_member
     reactComponentClass.dartComponentVersion = ReactDartComponentVersion.component2;
 
-    return new ReactDartComponentFactoryProxy2(reactComponentClass);
+    return ReactDartComponentFactoryProxy2(reactComponentClass);
   } catch (e, stack) {
     if (!errorPrinted) print('Error when registering Component2: $e\n$stack');
     rethrow;
diff --git a/lib/src/react_client/dart_interop_statics.dart b/lib/src/react_client/dart_interop_statics.dart
index 0416a2bc..4b39d1e1 100644
--- a/lib/src/react_client/dart_interop_statics.dart
+++ b/lib/src/react_client/dart_interop_statics.dart
@@ -12,14 +12,13 @@ import 'package:react/react_client/js_interop_helpers.dart';
 import 'package:react/react_client/react_interop.dart';
 import 'package:react/react_client/zone.dart';
 
-import 'package:react/src/context.dart';
 import 'package:react/src/react_client/private_utils.dart';
 import 'package:react/src/typedefs.dart';
 
 /// The static methods that proxy JS component lifecycle methods to Dart components.
 @Deprecated('7.0.0')
 final ReactDartInteropStatics dartInteropStatics = (() {
-  var zone = Zone.current;
+  final zone = Zone.current;
 
   /// Wrapper for [Component.getInitialState].
   Component initComponent(ReactComponent jsThis, ReactDartComponentInternal internal, InteropContextValue context,
@@ -29,8 +28,11 @@ final ReactDartInteropStatics dartInteropStatics = (() {
           jsThis.setState(newObject());
         }
 
-        RefMethod getRef = (name) {
-          var ref = getProperty(jsThis.refs, name);
+        // Use a LHS type to ensure this has the same exact static type
+        // (including arguments and return types) as initComponentInternal expects.
+        // ignore: omit_local_variable_types, prefer_function_declarations_over_variables
+        final RefMethod getRef = (name) {
+          final ref = getProperty(jsThis.refs, name);
           if (ref == null) return null;
           if (ref is Element) return ref;
           if (ref is ReactComponent) return ref.dartComponent ?? ref;
@@ -38,7 +40,7 @@ final ReactDartInteropStatics dartInteropStatics = (() {
           return ref;
         };
 
-        Component component = componentStatics.componentFactory()
+        final component = componentStatics.componentFactory()
           ..initComponentInternal(internal.props, jsRedraw, getRef, jsThis, unjsifyContext(context))
           ..initStateInternal();
 
@@ -64,8 +66,8 @@ final ReactDartInteropStatics dartInteropStatics = (() {
       });
 
   Map _getNextProps(Component component, ReactDartComponentInternal nextInternal) {
-    var newProps = nextInternal.props;
-    return newProps != null ? new Map.from(newProps) : {};
+    final newProps = nextInternal.props;
+    return newProps != null ? Map.from(newProps) : {};
   }
 
   /// 1. Update [Component.props] using the value stored to [Component.nextProps]
@@ -85,22 +87,23 @@ final ReactDartInteropStatics dartInteropStatics = (() {
   }
 
   void _callSetStateCallbacks(Component component) {
-    var callbacks = component.setStateCallbacks.toList();
+    final callbacks = component.setStateCallbacks.toList();
     // Prevent concurrent modification during iteration
     component.setStateCallbacks.clear();
-    callbacks.forEach((callback) {
+    for (final callback in callbacks) {
       callback();
-    });
+    }
   }
 
   void _callSetStateTransactionalCallbacks(Component component) {
-    var nextState = component.nextState;
-    var props = new UnmodifiableMapView(component.props);
+    final nextState = component.nextState;
+    final props = UnmodifiableMapView(component.props);
 
-    component.transactionalSetStateCallbacks.forEach((callback) {
+    for (final _callback in component.transactionalSetStateCallbacks) {
+      final callback = _callback as StateUpdaterCallback;
       final stateUpdates = callback(nextState, props);
       if (stateUpdates != null) nextState.addAll(stateUpdates);
-    });
+    }
     component.transactionalSetStateCallbacks.clear();
   }
 
@@ -108,8 +111,8 @@ final ReactDartInteropStatics dartInteropStatics = (() {
   void handleComponentWillReceiveProps(
           Component component, ReactDartComponentInternal nextInternal, InteropContextValue nextContext) =>
       zone.run(() {
-        var nextProps = _getNextProps(component, nextInternal);
-        var newContext = unjsifyContext(nextContext);
+        final nextProps = _getNextProps(component, nextInternal);
+        final newContext = unjsifyContext(nextContext);
 
         component
           ..nextProps = nextProps
@@ -124,12 +127,10 @@ final ReactDartInteropStatics dartInteropStatics = (() {
 
         // If shouldComponentUpdateWithContext returns a valid bool (default implementation returns null),
         // then don't bother calling `shouldComponentUpdate` and have it trump.
-        bool shouldUpdate =
+        var shouldUpdate =
             component.shouldComponentUpdateWithContext(component.nextProps, component.nextState, component.nextContext);
 
-        if (shouldUpdate == null) {
-          shouldUpdate = component.shouldComponentUpdate(component.nextProps, component.nextState);
-        }
+        shouldUpdate ??= component.shouldComponentUpdate(component.nextProps, component.nextState);
 
         if (shouldUpdate) {
           return true;
@@ -157,7 +158,7 @@ final ReactDartInteropStatics dartInteropStatics = (() {
   ///
   /// Uses [prevState] which was transferred from [Component.nextState] in [componentWillUpdate].
   void handleComponentDidUpdate(Component component, ReactDartComponentInternal prevInternal) => zone.run(() {
-        var prevInternalProps = prevInternal.props;
+        final prevInternalProps = prevInternal.props;
 
         /// Call `componentDidUpdate` and the context variant
         component.componentDidUpdate(prevInternalProps, component.prevState);
@@ -181,7 +182,7 @@ final ReactDartInteropStatics dartInteropStatics = (() {
         return component.render();
       });
 
-  return new ReactDartInteropStatics(
+  return ReactDartInteropStatics(
       initComponent: allowInterop(initComponent),
       handleGetChildContext: allowInterop(handleGetChildContext),
       handleComponentWillMount: allowInterop(handleComponentWillMount),
@@ -197,8 +198,8 @@ final ReactDartInteropStatics dartInteropStatics = (() {
 abstract class ReactDartInteropStatics2 {
   static void _updatePropsAndStateWithJs(Component2 component, JsMap props, JsMap state) {
     component
-      ..props = new JsBackedMap.backedBy(props)
-      ..state = new JsBackedMap.backedBy(state);
+      ..props = JsBackedMap.backedBy(props)
+      ..state = JsBackedMap.backedBy(state);
   }
 
   static void _updateContextWithJs(Component2 component, dynamic jsContext) {
@@ -206,19 +207,18 @@ abstract class ReactDartInteropStatics2 {
   }
 
   static Component2 initComponent(ReactComponent jsThis, ComponentStatics2 componentStatics) => // dartfmt
+      // ignore: invalid_use_of_visible_for_testing_member
       componentZone.run(() {
-        final component = componentStatics.componentFactory();
-        // Return the component so that the JS proxying component can store it,
-        // avoiding an interceptor lookup.
-
-        component
+        final component = componentStatics.componentFactory()
+          // Return the component so that the JS proxying component can store it,
+          // avoiding an interceptor lookup.
           ..jsThis = jsThis
-          ..props = new JsBackedMap.backedBy(jsThis.props)
+          ..props = JsBackedMap.backedBy(jsThis.props)
           ..context = ContextHelpers.unjsifyNewContext(jsThis.context);
 
         jsThis.state = jsBackingMapOrJsCopy(component.initialState);
 
-        component.state = new JsBackedMap.backedBy(jsThis.state);
+        component.state = JsBackedMap.backedBy(jsThis.state);
 
         // ignore: invalid_use_of_protected_member
         Component2Bridge.bridgeForComponent[component] = componentStatics.bridgeFactory(component);
@@ -226,15 +226,17 @@ abstract class ReactDartInteropStatics2 {
       });
 
   static void handleComponentDidMount(Component2 component) => // dartfmt
+      // ignore: invalid_use_of_visible_for_testing_member
       componentZone.run(() {
         component.componentDidMount();
       });
 
   static bool handleShouldComponentUpdate(Component2 component, JsMap jsNextProps, JsMap jsNextState) => // dartfmt
+      // ignore: invalid_use_of_visible_for_testing_member
       componentZone.run(() {
         final value = component.shouldComponentUpdate(
-          new JsBackedMap.backedBy(jsNextProps),
-          new JsBackedMap.backedBy(jsNextState),
+          JsBackedMap.backedBy(jsNextProps),
+          JsBackedMap.backedBy(jsNextState),
         );
 
         if (!value) {
@@ -246,9 +248,10 @@ abstract class ReactDartInteropStatics2 {
 
   static JsMap handleGetDerivedStateFromProps(
           ComponentStatics2 componentStatics, JsMap jsNextProps, JsMap jsPrevState) => // dartfmt
+      // ignore: invalid_use_of_visible_for_testing_member
       componentZone.run(() {
-        var derivedState = componentStatics.instanceForStaticMethods
-            .getDerivedStateFromProps(new JsBackedMap.backedBy(jsNextProps), new JsBackedMap.backedBy(jsPrevState));
+        final derivedState = componentStatics.instanceForStaticMethods
+            .getDerivedStateFromProps(JsBackedMap.backedBy(jsNextProps), JsBackedMap.backedBy(jsPrevState));
         if (derivedState != null) {
           return jsBackingMapOrJsCopy(derivedState);
         }
@@ -256,10 +259,11 @@ abstract class ReactDartInteropStatics2 {
       });
 
   static dynamic handleGetSnapshotBeforeUpdate(Component2 component, JsMap jsPrevProps, JsMap jsPrevState) => // dartfmt
+      // ignore: invalid_use_of_visible_for_testing_member
       componentZone.run(() {
         final snapshotValue = component.getSnapshotBeforeUpdate(
-          new JsBackedMap.backedBy(jsPrevProps),
-          new JsBackedMap.backedBy(jsPrevState),
+          JsBackedMap.backedBy(jsPrevProps),
+          JsBackedMap.backedBy(jsPrevState),
         );
 
         return snapshotValue;
@@ -268,20 +272,23 @@ abstract class ReactDartInteropStatics2 {
   static void handleComponentDidUpdate(
           Component2 component, ReactComponent jsThis, JsMap jsPrevProps, JsMap jsPrevState,
           [dynamic snapshot]) => // dartfmt
+      // ignore: invalid_use_of_visible_for_testing_member
       componentZone.run(() {
         component.componentDidUpdate(
-          new JsBackedMap.backedBy(jsPrevProps),
-          new JsBackedMap.backedBy(jsPrevState),
+          JsBackedMap.backedBy(jsPrevProps),
+          JsBackedMap.backedBy(jsPrevState),
           snapshot,
         );
       });
 
   static void handleComponentWillUnmount(Component2 component) => // dartfmt
+      // ignore: invalid_use_of_visible_for_testing_member
       componentZone.run(() {
         component.componentWillUnmount();
       });
 
   static void handleComponentDidCatch(Component2 component, dynamic error, ReactErrorInfo info) => // dartfmt
+      // ignore: invalid_use_of_visible_for_testing_member
       componentZone.run(() {
         // Due to the error object being passed in from ReactJS it is a javascript object that does not get dartified.
         // To fix this we throw the error again from Dart to the JS side and catch it Dart side which re-dartifies it.
@@ -295,6 +302,7 @@ abstract class ReactDartInteropStatics2 {
       });
 
   static JsMap handleGetDerivedStateFromError(ComponentStatics2 componentStatics, dynamic error) => // dartfmt
+      // ignore: invalid_use_of_visible_for_testing_member
       componentZone.run(() {
         // Due to the error object being passed in from ReactJS it is a javascript object that does not get dartified.
         // To fix this we throw the error again from Dart to the JS side and catch it Dart side which re-dartifies it.
@@ -308,6 +316,7 @@ abstract class ReactDartInteropStatics2 {
       });
 
   static dynamic handleRender(Component2 component, JsMap jsProps, JsMap jsState, dynamic jsContext) => // dartfmt
+      // ignore: invalid_use_of_visible_for_testing_member
       componentZone.run(() {
         _updatePropsAndStateWithJs(component, jsProps, jsState);
         _updateContextWithJs(component, jsContext);
@@ -325,5 +334,5 @@ abstract class ReactDartInteropStatics2 {
     'handleComponentDidCatch': handleComponentDidCatch,
     'handleGetDerivedStateFromError': handleGetDerivedStateFromError,
     'handleRender': handleRender,
-  });
+  }) as JsMap;
 }
diff --git a/lib/src/react_client/event_prop_key_to_event_factory.dart b/lib/src/react_client/event_prop_key_to_event_factory.dart
index 64084c85..1ea510c2 100644
--- a/lib/src/react_client/event_prop_key_to_event_factory.dart
+++ b/lib/src/react_client/event_prop_key_to_event_factory.dart
@@ -80,7 +80,7 @@ final Set<String> knownEventKeys = (() {
   };
 
   // Add support for capturing variants; e.g., onClick/onClickCapture
-  for (var key in _knownEventKeys.toList()) {
+  for (final key in _knownEventKeys.toList()) {
     _knownEventKeys.add(key + 'Capture');
   }
 
diff --git a/lib/src/react_client/factory_util.dart b/lib/src/react_client/factory_util.dart
index fd055391..aa3f4201 100644
--- a/lib/src/react_client/factory_util.dart
+++ b/lib/src/react_client/factory_util.dart
@@ -1,8 +1,6 @@
 @JS()
 library react_client_factory_utils;
 
-import 'dart:js';
-
 import 'package:js/js.dart';
 
 import 'package:react/react_client/component_factory.dart';
@@ -34,7 +32,7 @@ dynamic convertArgsToChildren(List childrenArgs) {
 Function unconvertJsEventHandler(Function jsConvertedEventHandler) => null;
 
 void convertRefValue(Map args) {
-  var ref = args['ref'];
+  final ref = args['ref'];
   if (ref is Ref) {
     args['ref'] = ref.jsRef;
   }
@@ -48,7 +46,7 @@ void convertRefValue2(
   final refKeys = ['ref', ...additionalRefPropKeys];
 
   for (final refKey in refKeys) {
-    var ref = args[refKey];
+    final ref = args[refKey];
     if (ref is Ref) {
       args[refKey] = ref.jsRef;
       // If the ref is a callback, pass ReactJS a function that will call it
@@ -57,6 +55,7 @@ void convertRefValue2(
       // Use _CallbackRef<Null> to check arity, since parameters could be non-dynamic, and thus
       // would fail the `is _CallbackRef<dynamic>` check.
       // See https://github.com/dart-lang/sdk/issues/34593 for more information on arity checks.
+      // ignore: prefer_void_to_null
     } else if (ref is CallbackRef<Null> && convertCallbackRefValue) {
       args[refKey] = allowInterop((dynamic instance) {
         // Call as dynamic to perform dynamic dispatch, since we can't cast to _CallbackRef<dynamic>,
@@ -102,7 +101,7 @@ dynamic generateChildren(List childrenArgs, {bool shouldAlwaysBeList = false}) {
 
   if (children == null) {
     children = shouldAlwaysBeList ? childrenArgs.map(listifyChildren).toList() : childrenArgs;
-    markChildrenValidated(children);
+    markChildrenValidated(children as List);
   }
 
   return children;
@@ -120,5 +119,5 @@ JsMap generateJsProps(Map props,
         convertCallbackRefValue: convertCallbackRefValue, additionalRefPropKeys: additionalRefPropKeys);
   }
 
-  return wrapWithJsify ? jsifyAndAllowInterop(propsForJs) : propsForJs.jsObject;
+  return wrapWithJsify ? jsifyAndAllowInterop(propsForJs) as JsMap : propsForJs.jsObject;
 }
diff --git a/lib/src/react_client/private_utils.dart b/lib/src/react_client/private_utils.dart
index f70e6be6..3ea23ed9 100644
--- a/lib/src/react_client/private_utils.dart
+++ b/lib/src/react_client/private_utils.dart
@@ -14,10 +14,10 @@ bool _isJsApiValid = false;
 
 @Deprecated('7.0.0')
 InteropContextValue jsifyContext(Map<String, dynamic> context) {
-  var interopContext = new InteropContextValue();
+  final interopContext = InteropContextValue();
   context.forEach((key, value) {
     // ignore: argument_type_not_assignable
-    setProperty(interopContext, key, new ReactDartContextInternal(value));
+    setProperty(interopContext, key, ReactDartContextInternal(value));
   });
 
   return interopContext;
@@ -32,9 +32,8 @@ T validateJsApiThenReturn<T>(T Function() computeReturn) {
 @Deprecated('7.0.0')
 Map<String, dynamic> unjsifyContext(InteropContextValue interopContext) {
   // TODO consider using `contextKeys` for this if perf of objectKeys is bad.
-  return new Map.fromIterable(objectKeys(interopContext), value: (key) {
-    // ignore: argument_type_not_assignable
-    ReactDartContextInternal internal = getProperty(interopContext, key);
+  return Map.fromIterable(objectKeys(interopContext), value: (key) {
+    final internal = getProperty(interopContext, key) as ReactDartContextInternal;
     return internal?.value;
   });
 }
@@ -54,9 +53,9 @@ void validateJsApi() {
     createReactDartComponentClass2(null, null, null);
     _isJsApiValid = true;
   } on NoSuchMethodError catch (_) {
-    throw new Exception('react.js and react_dom.js must be loaded.');
+    throw Exception('react.js and react_dom.js must be loaded.');
   } catch (_) {
-    throw new Exception('Loaded react.js must include react-dart JS interop helpers.');
+    throw Exception('Loaded react.js must include react-dart JS interop helpers.');
   }
 }
 
diff --git a/lib/src/react_client/synthetic_data_transfer.dart b/lib/src/react_client/synthetic_data_transfer.dart
index f2698abc..227ecf39 100644
--- a/lib/src/react_client/synthetic_data_transfer.dart
+++ b/lib/src/react_client/synthetic_data_transfer.dart
@@ -104,8 +104,8 @@ SyntheticDataTransfer syntheticDataTransferFactory(Object dt) {
   }
 
   // Copy these lists and ensure they're typed properly.
-  final files = <File>[...?rawFiles];
-  final types = <String>[...?rawTypes];
+  final files = List<File>.from(rawFiles ?? []);
+  final types = List<String>.from(rawTypes ?? []);
 
-  return new SyntheticDataTransfer(dropEffect, effectAllowed, files, types);
+  return SyntheticDataTransfer(dropEffect, effectAllowed, files, types);
 }
diff --git a/lib/src/react_client/synthetic_event_wrappers.dart b/lib/src/react_client/synthetic_event_wrappers.dart
index 66187bf0..c4719b0e 100644
--- a/lib/src/react_client/synthetic_event_wrappers.dart
+++ b/lib/src/react_client/synthetic_event_wrappers.dart
@@ -13,7 +13,7 @@ import 'package:js/js.dart';
 /// It has the same interface as the browser's native event, including [stopPropagation] and [preventDefault], except
 /// the events work identically across all browsers.
 ///
-/// See: <https://facebook.github.io/react/docs/events.html#syntheticevent>
+/// See: <https://reactjs.org/docs/events.html#syntheticevent>
 @JS()
 // TODO make @anonymous once https://github.com/dart-lang/sdk/issues/43939 is fixed
 class SyntheticEvent {
@@ -65,7 +65,7 @@ class SyntheticEvent {
   external num get eventPhase;
 
   /// Is `true` when the [Event] was generated by a user action, and `false` when the [Event] was created or modified
-  /// by a script or dispatched via [Event.dispatchEvent].
+  /// by a script or dispatched via [EventTarget.dispatchEvent].
   ///
   /// __Read Only__
   ///
@@ -81,7 +81,7 @@ class SyntheticEvent {
   /// See: <https://developer.mozilla.org/en-US/docs/Web/API/Event/target>
   external /*DOMEventTarget*/ get target;
 
-  /// Returns the [Time] (in milliseconds) at which the [Event] was created.
+  /// Returns the time (in milliseconds) at which the [Event] was created.
   ///
   /// _Starting with Chrome 49, returns a high-resolution monotonic time instead of epoch time._
   ///
diff --git a/lib/src/typedefs.dart b/lib/src/typedefs.dart
index 0f7f0e48..6f09e1e6 100644
--- a/lib/src/typedefs.dart
+++ b/lib/src/typedefs.dart
@@ -5,8 +5,8 @@ import 'package:react/react_client/js_backed_map.dart';
 
 /// The type of `Component.ref` specified as a callback.
 ///
-/// See: <https://facebook.github.io/react/docs/more-about-refs.html#the-ref-callback-attribute>
-typedef CallbackRef<T>(T componentOrDomNode);
+/// See: <https://reactjs.org/docs/refs-and-the-dom.html#the-ref-callback-attribute>
+typedef CallbackRef<T> = Function(T componentOrDomNode);
 
 /// The function signature for ReactJS Function Components.
 ///
@@ -21,14 +21,14 @@ typedef JsForwardRefFunctionComponent = dynamic Function(JsMap props, dynamic re
 ///
 /// * `react.Component` if it is a Dart component.
 /// * `Element` _(DOM node)_ if it is a React DOM component.
-typedef dynamic RefMethod(String ref);
+typedef RefMethod = dynamic Function(String ref);
 
 /// Typedef for the `updater` argument of [Component2.setStateWithUpdater].
 ///
 /// See: <https://reactjs.org/docs/react-component.html#setstate>
-typedef Map StateUpdaterCallback(Map prevState, Map props);
+typedef StateUpdaterCallback = Map Function(Map prevState, Map props);
 
 /// Typedef of a non-transactional [Component2.setState] callback.
 ///
 /// See: <https://reactjs.org/docs/react-component.html#setstate>
-typedef SetStateCallback();
+typedef SetStateCallback = Function();
diff --git a/pubspec.yaml b/pubspec.yaml
index 311d15ef..c62f298f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,3 +16,4 @@ dev_dependencies:
   matcher: ^0.12.11
   mockito: ^5.3.1
   test: ^1.17.12
+  workiva_analysis_options: ^1.3.0
diff --git a/test/factory/common_factory_tests.dart b/test/factory/common_factory_tests.dart
index 68d2b80c..17f00215 100644
--- a/test/factory/common_factory_tests.dart
+++ b/test/factory/common_factory_tests.dart
@@ -9,7 +9,6 @@ import 'dart:js_util';
 
 import 'package:js/js.dart';
 import 'package:meta/meta.dart';
-import 'package:react/react_client/component_factory.dart';
 import 'package:react/react_client/js_backed_map.dart';
 import 'package:react/react_client/js_interop_helpers.dart';
 import 'package:test/test.dart';
@@ -35,7 +34,7 @@ void commonFactoryTests(ReactComponentFactoryProxy factory,
   );
 
   test('renders an instance with the corresponding `type`', () {
-    var instance = factory({});
+    final instance = factory({});
 
     expect(instance.type, equals(factory.type));
   });
@@ -45,7 +44,7 @@ void commonFactoryTests(ReactComponentFactoryProxy factory,
     expect(ReactDartComponentVersion.fromType(factory.type), dartComponentVersion);
   });
 
-  void sharedChildrenTests(dynamic getChildren(ReactElement instance),
+  void sharedChildrenTests(dynamic Function(ReactElement instance) getChildren,
       {@required bool shouldAlwaysBeList, Map props = const {}}) {
     // There are different code paths for 0, 1, 2, 3, 4, 5, 6, and 6+ arguments.
     // Test all of them.
@@ -66,9 +65,9 @@ void commonFactoryTests(ReactComponentFactoryProxy factory,
         final childrenCount = i;
 
         test('$childrenCount', () {
-          final expectedChildren = new List.generate(childrenCount, (i) => i + 1);
+          final expectedChildren = List.generate(childrenCount, (i) => i + 1);
           final arguments = <dynamic>[props, ...expectedChildren];
-          final instance = Function.apply(factory, arguments);
+          final instance = Function.apply(factory, arguments) as ReactElement;
           expect(getChildren(instance), expectedChildren);
         }, tags: i > 5 ? 'dart-2-7-dart2js-variadic-issues' : null);
       }
@@ -77,13 +76,13 @@ void commonFactoryTests(ReactComponentFactoryProxy factory,
         final instance = factory(props, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
             23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40);
         // Generate these instead of hard coding them to ensure the arguments passed into this test match maxSupportedVariadicChildCount
-        final expectedChildren = new List.generate(maxSupportedVariadicChildCount, (i) => i + 1);
+        final expectedChildren = List.generate(maxSupportedVariadicChildCount, (i) => i + 1);
         expect(getChildren(instance), equals(expectedChildren));
       }, tags: 'dart-2-7-dart2js-variadic-issues');
     });
 
     test('a List', () {
-      var instance = factory(props, [
+      final instance = factory(props, [
         'one',
         'two',
       ]);
@@ -91,17 +90,17 @@ void commonFactoryTests(ReactComponentFactoryProxy factory,
     });
 
     test('an empty List', () {
-      var instance = factory(props, []);
+      final instance = factory(props, []);
       expect(getChildren(instance), equals([]));
     });
 
     test('an Iterable', () {
-      var instance = factory(props, new Iterable.generate(3, (int i) => '$i'));
+      final instance = factory(props, Iterable.generate(3, (i) => '$i'));
       expect(getChildren(instance), equals(['0', '1', '2']));
     });
 
     test('an empty Iterable', () {
-      var instance = factory(props, new Iterable.empty());
+      final instance = factory(props, Iterable.empty());
       expect(getChildren(instance), equals([]));
     });
   }
@@ -235,7 +234,7 @@ void domEventHandlerWrappingTests(ReactComponentFactoryProxy factory) {
       propsFromDartRender = null;
 
       var element = factory({
-        'onDartRender': (p) {
+        'onDartRender': (Map p) {
           propsFromDartRender = p;
         },
         dart.eventPropKey: (event) => events[dart] = event,
@@ -246,7 +245,7 @@ void domEventHandlerWrappingTests(ReactComponentFactoryProxy factory) {
         element,
         jsifyAndAllowInterop({
           jsCloned.eventPropKey: (event) => events[jsCloned] = event,
-        }),
+        }) as JsMap,
       );
 
       element = React.cloneElement(
@@ -263,7 +262,7 @@ void domEventHandlerWrappingTests(ReactComponentFactoryProxy factory) {
     });
 
     group('passing Dart events to Dart handlers, and JS events to handlers originating from JS:', () {
-      for (var eventCase in eventCases) {
+      for (final eventCase in eventCases) {
         test(eventCase.description, () {
           eventCase.simulate(node);
           expect(events[eventCase], isNotNull, reason: 'handler should have been called');
@@ -283,13 +282,13 @@ void domEventHandlerWrappingTests(ReactComponentFactoryProxy factory) {
         final divRef = react.createRef<DivElement>();
         render(react.div({
           'ref': divRef,
-          'onClick': (e) => event = e,
-        }));
+          'onClick': (react.SyntheticMouseEvent e) => event = e,
+        }) as ReactElement);
         rtu.Simulate.click(divRef);
 
         final dummyEvent = event;
 
-        for (var eventCase in eventCases.where((helper) => helper.isDart)) {
+        for (final eventCase in eventCases.where((helper) => helper.isDart)) {
           test(eventCase.description, () {
             expect(() => propsFromDartRender[eventCase.eventPropKey](dummyEvent), returnsNormally);
           });
@@ -352,7 +351,7 @@ void domEventHandlerWrappingTests(ReactComponentFactoryProxy factory) {
         }));
       });
 
-      nodeWithClickHandler.dispatchEvent(new MouseEvent('click'));
+      nodeWithClickHandler.dispatchEvent(MouseEvent('click'));
     });
   });
 }
@@ -368,8 +367,8 @@ void domEventHandlerWrappingTests(ReactComponentFactoryProxy factory) {
 /// It will be called with the actual ref value for JS refs, (e.g., JS ref objects as opposed to Dart objects)
 void refTests<T>(
   ReactComponentFactoryProxy factory, {
-  @required void verifyRefValue(dynamic refValue),
-  void verifyJsRefValue(dynamic refValue),
+  @required void Function(dynamic refValue) verifyRefValue,
+  void Function(dynamic refValue) verifyJsRefValue,
 }) {
   if (T == dynamic) {
     throw ArgumentError('Generic parameter T must be specified');
@@ -404,9 +403,8 @@ void refTests<T>(
     }
 
     test('string refs', () {
-      ReactComponent renderedInstance = _renderWithStringRefSupportingOwner(() => factory({'ref': 'test'}));
+      final renderedInstance = _renderWithStringRefSupportingOwner(() => factory({'ref': 'test'}));
 
-      // ignore: deprecated_member_use_from_same_package
       verifyRefValue(renderedInstance.dartComponent.ref('test'));
     });
   });
@@ -418,7 +416,7 @@ void refTests<T>(
       if (!name.contains('callback ref')) {
         test(name, () {
           final testCase = testCaseCollection.createCaseByName(name);
-          var ForwardRefTestComponent = forwardRef((props, ref) {
+          final ForwardRefTestComponent = forwardRef((props, ref) {
             return factory({'ref': ref});
           });
 
@@ -436,7 +434,7 @@ void refTests<T>(
     for (final name in testCaseCollection.allTestCaseNames) {
       test(name, () {
         final testCase = testCaseCollection.createCaseByName(name);
-        var ForwardRefTestComponent = forwardRef2((props, ref) {
+        final ForwardRefTestComponent = forwardRef2((props, ref) {
           return factory({'ref': ref});
         });
 
@@ -544,7 +542,8 @@ void refTests<T>(
   });
 }
 
-void _childKeyWarningTests(Function factory, {Function(ReactElement Function()) renderWithUniqueOwnerName}) {
+void _childKeyWarningTests(ReactComponentFactoryProxy factory,
+    {Function(ReactElement Function()) renderWithUniqueOwnerName}) {
   group('key/children validation', () {
     bool consoleErrorCalled;
     var consoleErrorMessage;
@@ -554,8 +553,8 @@ void _childKeyWarningTests(Function factory, {Function(ReactElement Function())
       consoleErrorCalled = false;
       consoleErrorMessage = null;
 
-      originalConsoleError = context['console']['error'];
-      context['console']['error'] = new JsFunction.withThis((self, message, arg1, arg2, arg3) {
+      originalConsoleError = context['console']['error'] as JsFunction;
+      context['console']['error'] = JsFunction.withThis((self, message, arg1, arg2, arg3) {
         consoleErrorCalled = true;
         consoleErrorMessage = message;
 
@@ -601,11 +600,11 @@ class _StringRefOwnerOwnerHelperComponent extends react.Component {
 
 /// Renders the provided [render] function with a Component owner that supports string refs,
 /// for string ref tests.
-ReactComponent _renderWithStringRefSupportingOwner(ReactElement render()) {
+ReactComponent _renderWithStringRefSupportingOwner(ReactElement Function() render) {
   final factory =
-      react.registerComponent(() => new _StringRefOwnerOwnerHelperComponent()) as ReactDartComponentFactoryProxy;
+      react.registerComponent(() => _StringRefOwnerOwnerHelperComponent()) as ReactDartComponentFactoryProxy;
 
-  return rtu.renderIntoDocument(factory({'render': render}));
+  return rtu.renderIntoDocument(factory({'render': render})) as ReactComponent;
 }
 
 int _nextFactoryId = 0;
@@ -613,8 +612,8 @@ int _nextFactoryId = 0;
 /// Renders the provided [render] function with a Component2 owner that will have a unique name.
 ///
 /// This prevents React JS from not printing key warnings it deems as "duplicates".
-void _renderWithUniqueOwnerName(ReactElement render()) {
-  final factory = react.registerComponent2(() => new _UniqueOwnerHelperComponent());
+void _renderWithUniqueOwnerName(ReactElement Function() render) {
+  final factory = react.registerComponent2(() => _UniqueOwnerHelperComponent());
   factory.reactClass.displayName = 'OwnerHelperComponent_$_nextFactoryId';
   _nextFactoryId++;
 
@@ -646,15 +645,17 @@ class EventTestCase {
         description = 'JS handler $description';
 
   String get _camelCaseEventName {
-    var name = eventPropKey.replaceFirst(RegExp(r'^on'), '');
-    name = name.substring(0, 1).toLowerCase() + name.substring(1);
-    return name;
+    return eventPropKey.replaceFirst(RegExp(r'^on'), '').capitalize();
   }
 
   void simulate(Element node) => callMethod(_Simulate, _camelCaseEventName, [node]);
 
   @override
-  String toString() => 'EventHelper: ($eventPropKey) $description';
+  toString() => 'EventHelper: ($eventPropKey) $description';
+}
+
+extension on String {
+  String capitalize() => substring(0, 1).toLowerCase() + substring(1);
 }
 
 @JS('React.addons.TestUtils.Simulate')
diff --git a/test/factory/dart_factory_test.dart b/test/factory/dart_factory_test.dart
index 7cd5d536..ff2707f2 100644
--- a/test/factory/dart_factory_test.dart
+++ b/test/factory/dart_factory_test.dart
@@ -57,7 +57,7 @@ main() {
   });
 }
 
-final Foo = react.registerComponent(() => new _Foo()) as ReactDartComponentFactoryProxy;
+final Foo = react.registerComponent(() => _Foo()) as ReactDartComponentFactoryProxy;
 
 class _Foo extends react.Component {
   @override
@@ -67,7 +67,7 @@ class _Foo extends react.Component {
   }
 }
 
-final Foo2 = react.registerComponent2(() => new _Foo2());
+final Foo2 = react.registerComponent2(() => _Foo2());
 
 class _Foo2 extends react.Component2 {
   @override
diff --git a/test/factory/dart_function_factory_test.dart b/test/factory/dart_function_factory_test.dart
index d33ae1a2..f8bbf401 100644
--- a/test/factory/dart_function_factory_test.dart
+++ b/test/factory/dart_function_factory_test.dart
@@ -3,9 +3,9 @@
 @TestOn('browser')
 library react.dart_function_factory_test;
 
-import 'package:js/js_util.dart';
 import 'package:react/react.dart' as react;
 import 'package:react/react_client/react_interop.dart';
+import 'package:react/src/js_interop_util.dart';
 import 'package:test/test.dart';
 
 import 'common_factory_tests.dart';
@@ -28,25 +28,23 @@ main() {
         test('gets automatically populated when not provided', () {
           expect(FunctionFoo.displayName, '_FunctionFoo');
 
-          expect(_getJsFunctionName(FunctionFoo.reactFunction), '_FunctionFoo');
+          expect(getJsFunctionName(FunctionFoo.reactFunction), '_FunctionFoo');
 
-          expect(FunctionFoo.displayName, _getJsFunctionName(FunctionFoo.reactFunction));
+          expect(FunctionFoo.displayName, getJsFunctionName(FunctionFoo.reactFunction));
         });
 
         test('is populated by the provided argument', () {
           expect(NamedFunctionFoo.displayName, 'Bar');
 
-          expect(_getJsFunctionName(NamedFunctionFoo.reactFunction), 'Bar');
+          expect(getJsFunctionName(NamedFunctionFoo.reactFunction), 'Bar');
 
-          expect(NamedFunctionFoo.displayName, _getJsFunctionName(NamedFunctionFoo.reactFunction));
+          expect(NamedFunctionFoo.displayName, getJsFunctionName(NamedFunctionFoo.reactFunction));
         });
       });
     });
   });
 }
 
-String _getJsFunctionName(Function object) => getProperty(object, 'name') ?? getProperty(object, '\$static_name');
-
 final NamedFunctionFoo = react.registerFunctionComponent(_FunctionFoo, displayName: 'Bar');
 
 final FunctionFoo = react.registerFunctionComponent(_FunctionFoo);
diff --git a/test/factory/dom_factory_test.dart b/test/factory/dom_factory_test.dart
index 4cc7fb77..8bf05321 100644
--- a/test/factory/dom_factory_test.dart
+++ b/test/factory/dom_factory_test.dart
@@ -3,31 +3,36 @@ library react.dom_factory_test;
 
 import 'dart:html';
 
+import 'package:react/react_client.dart';
 import 'package:test/test.dart';
 
 import 'package:react/react.dart' as react;
 
 import 'common_factory_tests.dart';
 
+// Public APIs with tightened types to help fix implicit casts
+final div = react.div as ReactDomComponentFactoryProxy;
+final span = react.span as ReactDomComponentFactoryProxy;
+
 main() {
   group('ReactDomComponentFactoryProxy', () {
     group('- common factory behavior -', () {
-      commonFactoryTests(react.div);
+      commonFactoryTests(div);
     });
 
     group('- dom event handler wrapping -', () {
-      domEventHandlerWrappingTests(react.div);
+      domEventHandlerWrappingTests(div);
     });
 
     group('- refs -', () {
-      refTests<SpanElement>(react.span, verifyRefValue: (ref) {
+      refTests<SpanElement>(span, verifyRefValue: (ref) {
         expect(ref, TypeMatcher<SpanElement>());
       });
     });
 
     test('has a type corresponding to the DOM tagName', () {
-      expect(react.div.type, 'div');
-      expect(react.span.type, 'span');
+      expect(div.type, 'div');
+      expect(span.type, 'span');
     });
   });
 }
diff --git a/test/factory/js_factory_test.dart b/test/factory/js_factory_test.dart
index 1f364a98..76f8eb55 100644
--- a/test/factory/js_factory_test.dart
+++ b/test/factory/js_factory_test.dart
@@ -66,11 +66,11 @@ main() {
 
 @JS()
 external ReactClass get _JsFoo;
-final JsFoo = new ReactJsComponentFactoryProxy(_JsFoo);
+final JsFoo = ReactJsComponentFactoryProxy(_JsFoo);
 
 @JS()
 external ReactClass get _JsFooFunction;
-final JsFooFunction = new ReactJsComponentFactoryProxy(_JsFooFunction);
+final JsFooFunction = ReactJsComponentFactoryProxy(_JsFooFunction);
 
 @JS()
 external bool Function(ReactElement) get hasUndefinedChildren;
diff --git a/test/forward_ref_test.dart b/test/forward_ref_test.dart
index ca9cedfe..011ed576 100644
--- a/test/forward_ref_test.dart
+++ b/test/forward_ref_test.dart
@@ -13,7 +13,6 @@ import 'factory/common_factory_tests.dart';
 main() {
   group('forwardRef', () {
     group('- common factory behavior -', () {
-      // ignore: deprecated_member_use_from_same_package
       final ForwardRefTest = react.forwardRef((props, ref) {
         props['onDartRender']?.call(props);
         return react.div({...props, 'ref': ref});
@@ -33,13 +32,13 @@ main() {
 
     group('sets displayName on the rendered component as expected', () {
       test('falling back to "Anonymous" when the displayName argument is not passed to forwardRef', () {
-        var ForwardRefTestComponent = forwardRef((props, ref) {});
+        final ForwardRefTestComponent = forwardRef((props, ref) {});
         expect(getProperty(getProperty(ForwardRefTestComponent.type, 'render'), 'displayName'), 'Anonymous');
       });
 
       test('when displayName argument is passed to forwardRef', () {
         const name = 'ForwardRefTestComponent';
-        var ForwardRefTestComponent = forwardRef((props, ref) {}, displayName: name);
+        final ForwardRefTestComponent = forwardRef((props, ref) {}, displayName: name);
         expect(getProperty(getProperty(ForwardRefTestComponent.type, 'render'), 'displayName'), name);
       });
     });
@@ -64,13 +63,13 @@ main() {
 
     group('sets name on the rendered component as expected', () {
       test('unless the displayName argument is not passed to forwardRef2', () {
-        var ForwardRefTestComponent = forwardRef2((props, ref) {});
+        final ForwardRefTestComponent = forwardRef2((props, ref) {});
         expect(getProperty(getProperty(ForwardRefTestComponent.type, 'render'), 'name'), anyOf('', isNull));
       });
 
       test('when displayName argument is passed to forwardRef2', () {
         const name = 'ForwardRefTestComponent';
-        var ForwardRefTestComponent = forwardRef2((props, ref) {}, displayName: name);
+        final ForwardRefTestComponent = forwardRef2((props, ref) {}, displayName: name);
         expect(getProperty(getProperty(ForwardRefTestComponent.type, 'render'), 'name'), name);
       });
     });
diff --git a/test/hooks_test.dart b/test/hooks_test.dart
index 360eb077..caf593fb 100644
--- a/test/hooks_test.dart
+++ b/test/hooks_test.dart
@@ -4,7 +4,7 @@ library hooks_test;
 
 import 'dart:html';
 
-import "package:js/js.dart";
+import 'package:js/js.dart';
 import 'package:react/hooks.dart';
 import 'package:react/react.dart' as react;
 import 'package:react/react.dart';
@@ -25,9 +25,9 @@ main() {
       ButtonElement setWithUpdaterButtonRef;
 
       setUpAll(() {
-        var mountNode = DivElement();
+        final mountNode = DivElement();
 
-        UseStateTest = react.registerFunctionComponent((Map props) {
+        UseStateTest = react.registerFunctionComponent((props) {
           final text = useStateLazy(() {
             return 'initialValue';
           });
@@ -36,14 +36,14 @@ main() {
           return react.div({}, [
             react.div({
               'ref': (ref) {
-                textRef = ref;
+                textRef = ref as DivElement;
               },
             }, [
               text.value
             ]),
             react.div({
               'ref': (ref) {
-                countRef = ref;
+                countRef = ref as DivElement;
               },
             }, [
               count.value
@@ -51,7 +51,7 @@ main() {
             react.button({
               'onClick': (_) => text.set('newValue'),
               'ref': (ref) {
-                setButtonRef = ref;
+                setButtonRef = ref as ButtonElement;
               },
             }, [
               'Set'
@@ -59,7 +59,7 @@ main() {
             react.button({
               'onClick': (_) => count.setWithUpdater((prev) => prev + 1),
               'ref': (ref) {
-                setWithUpdaterButtonRef = ref;
+                setWithUpdaterButtonRef = ref as ButtonElement;
               },
             }, [
               '+'
@@ -102,7 +102,7 @@ main() {
       ButtonElement textButtonRef;
 
       Map reducer(Map state, Map action) {
-        switch (action['type']) {
+        switch (action['type'] as String) {
           case 'increment':
             return {...state, 'count': state['count'] + 1};
           case 'decrement':
@@ -115,9 +115,9 @@ main() {
       }
 
       setUpAll(() {
-        var mountNode = DivElement();
+        final mountNode = DivElement();
 
-        UseReducerTest = react.registerFunctionComponent((Map props) {
+        UseReducerTest = react.registerFunctionComponent((props) {
           final state = useReducer(reducer, {
             'text': 'initialValue',
             'count': 0,
@@ -126,14 +126,14 @@ main() {
           return react.div({}, [
             react.div({
               'ref': (ref) {
-                textRef = ref;
+                textRef = ref as DivElement;
               },
             }, [
               state.state['text']
             ]),
             react.div({
               'ref': (ref) {
-                countRef = ref;
+                countRef = ref as DivElement;
               },
             }, [
               state.state['count']
@@ -141,7 +141,7 @@ main() {
             react.button({
               'onClick': (_) => state.dispatch({'type': 'changeText', 'newText': 'newValue'}),
               'ref': (ref) {
-                textButtonRef = ref;
+                textButtonRef = ref as ButtonElement;
               },
             }, [
               'Set'
@@ -149,7 +149,7 @@ main() {
             react.button({
               'onClick': (_) => state.dispatch({'type': 'increment'}),
               'ref': (ref) {
-                addButtonRef = ref;
+                addButtonRef = ref as ButtonElement;
               },
             }, [
               '+'
@@ -157,7 +157,7 @@ main() {
             react.button({
               'onClick': (_) => state.dispatch({'type': 'decrement'}),
               'ref': (ref) {
-                subtractButtonRef = ref;
+                subtractButtonRef = ref as ButtonElement;
               },
             }, [
               '-'
@@ -196,28 +196,28 @@ main() {
         }
 
         Map reducer2(Map state, Map action) {
-          switch (action['type']) {
+          switch (action['type'] as String) {
             case 'increment':
               return {...state, 'count': state['count'] + 1};
             case 'decrement':
               return {...state, 'count': state['count'] - 1};
             case 'reset':
-              return initializeCount(action['payload']);
+              return initializeCount(action['payload'] as int);
             default:
               return state;
           }
         }
 
         setUpAll(() {
-          var mountNode = DivElement();
+          final mountNode = DivElement();
 
-          UseReducerTest = react.registerFunctionComponent((Map props) {
-            final ReducerHook<Map, Map, int> state = useReducerLazy(reducer2, props['initialCount'], initializeCount);
+          UseReducerTest = react.registerFunctionComponent((props) {
+            final state = useReducerLazy(reducer2, props['initialCount'] as int, initializeCount);
 
             return react.div({}, [
               react.div({
                 'ref': (ref) {
-                  countRef = ref;
+                  countRef = ref as DivElement;
                 },
               }, [
                 state.state['count']
@@ -225,7 +225,7 @@ main() {
               react.button({
                 'onClick': (_) => state.dispatch({'type': 'reset', 'payload': props['initialCount']}),
                 'ref': (ref) {
-                  resetButtonRef = ref;
+                  resetButtonRef = ref as ButtonElement;
                 },
               }, [
                 'reset'
@@ -233,7 +233,7 @@ main() {
               react.button({
                 'onClick': (_) => state.dispatch({'type': 'increment'}),
                 'ref': (ref) {
-                  addButtonRef = ref;
+                  addButtonRef = ref as ButtonElement;
                 },
               }, [
                 '+'
@@ -241,7 +241,7 @@ main() {
               react.button({
                 'onClick': (_) => state.dispatch({'type': 'decrement'}),
                 'ref': (ref) {
-                  subtractButtonRef = ref;
+                  subtractButtonRef = ref as ButtonElement;
                 },
               }, [
                 '-'
@@ -282,35 +282,35 @@ main() {
       ButtonElement incrementDeltaButtonRef;
 
       setUpAll(() {
-        var mountNode = DivElement();
+        final mountNode = DivElement();
 
-        UseCallbackTest = react.registerFunctionComponent((Map props) {
+        UseCallbackTest = react.registerFunctionComponent((props) {
           final count = useState(0);
           final delta = useState(1);
 
-          var incrementNoDep = useCallback((_) {
+          final incrementNoDep = useCallback((_) {
             count.setWithUpdater((prev) => prev + delta.value);
           }, []);
 
-          var incrementWithDep = useCallback((_) {
+          final incrementWithDep = useCallback((_) {
             count.setWithUpdater((prev) => prev + delta.value);
           }, [delta.value]);
 
-          var incrementDelta = useCallback((_) {
+          final incrementDelta = useCallback((_) {
             delta.setWithUpdater((prev) => prev + 1);
           }, []);
 
           return react.div({}, [
             react.div({
               'ref': (ref) {
-                deltaRef = ref;
+                deltaRef = ref as DivElement;
               },
             }, [
               delta.value
             ]),
             react.div({
               'ref': (ref) {
-                countRef = ref;
+                countRef = ref as DivElement;
               },
             }, [
               count.value
@@ -318,7 +318,7 @@ main() {
             react.button({
               'onClick': incrementNoDep,
               'ref': (ref) {
-                incrementNoDepButtonRef = ref;
+                incrementNoDepButtonRef = ref as ButtonElement;
               },
             }, [
               'Increment count no dep'
@@ -326,7 +326,7 @@ main() {
             react.button({
               'onClick': incrementWithDep,
               'ref': (ref) {
-                incrementWithDepButtonRef = ref;
+                incrementWithDepButtonRef = ref as ButtonElement;
               },
             }, [
               'Increment count'
@@ -334,7 +334,7 @@ main() {
             react.button({
               'onClick': incrementDelta,
               'ref': (ref) {
-                incrementDeltaButtonRef = ref;
+                incrementDeltaButtonRef = ref as ButtonElement;
               },
             }, [
               'Increment delta'
@@ -376,7 +376,7 @@ main() {
     group('useContext -', () {
       DivElement mountNode;
       _ContextProviderWrapper providerRef;
-      int currentCount = 0;
+      var currentCount = 0;
       Context<int> testContext;
       Function useContextTestFunctionComponent;
 
@@ -389,7 +389,7 @@ main() {
           return react.div({
             'key': 'uct1'
           }, [
-            react.div({'key': 'uct2'}, ['useContext counter value is ${context}']),
+            react.div({'key': 'uct2'}, ['useContext counter value is $context']),
           ]);
         }
 
@@ -402,7 +402,7 @@ main() {
               'contextToUse': testContext,
               'mode': 'increment',
               'ref': (ref) {
-                providerRef = ref;
+                providerRef = ref as _ContextProviderWrapper;
               }
             }, [
               useContextTestFunctionComponent({'key': 't1'}, []),
@@ -436,7 +436,7 @@ main() {
     });
 
     group('useRef -', () {
-      var mountNode = DivElement();
+      final mountNode = DivElement();
       ReactDartFunctionComponentFactoryProxy UseRefTest;
       ButtonElement reRenderButton;
       var noInitRef;
@@ -447,7 +447,7 @@ main() {
       var refFromCreateRef;
 
       setUpAll(() {
-        UseRefTest = react.registerFunctionComponent((Map props) {
+        UseRefTest = react.registerFunctionComponent((props) {
           noInitRef = useRef();
           initRef = useRef(mountNode);
           domElementRef = useRef();
@@ -456,13 +456,9 @@ main() {
           refFromUseRef = useRef();
           refFromCreateRef = react.createRef();
 
-          if (refFromUseRef.current == null) {
-            refFromUseRef.current = renderIndex.value;
-          }
+          refFromUseRef.current ??= renderIndex.value;
 
-          if (refFromCreateRef.current == null) {
-            refFromCreateRef.current = renderIndex.value;
-          }
+          refFromCreateRef.current ??= renderIndex.value;
 
           return react.Fragment({}, [
             react.input({'ref': domElementRef}),
@@ -470,7 +466,7 @@ main() {
             react.p({}, [refFromUseRef.current]),
             react.p({}, [refFromCreateRef.current]),
             react.button({
-              'ref': (ref) => reRenderButton = ref,
+              'ref': (ref) => reRenderButton = ref as ButtonElement,
               'onClick': (_) => renderIndex.setWithUpdater((prev) => prev + 1)
             }, [
               're-render'
@@ -521,9 +517,9 @@ main() {
       ButtonElement incrementButtonRef;
 
       // Count how many times createFunction() is called for each variation of dependencies.
-      int createFunctionCallCountWithDeps = 0;
-      int createFunctionCallCountNoDeps = 0;
-      int createFunctionCallCountEmptyDeps = 0;
+      var createFunctionCallCountWithDeps = 0;
+      var createFunctionCallCountNoDeps = 0;
+      var createFunctionCallCountEmptyDeps = 0;
 
       // Keeps track of return value of useMemo() for each variation of dependencies.
       int returnValueWithDeps;
@@ -540,7 +536,7 @@ main() {
       setUpAll(() {
         final mountNode = DivElement();
 
-        UseMemoTest = react.registerFunctionComponent((Map props) {
+        UseMemoTest = react.registerFunctionComponent((props) {
           final reRender = useState(0);
           count = useState(5);
 
@@ -568,11 +564,14 @@ main() {
           );
 
           return react.Fragment({}, [
-            react.button(
-                {'ref': (ref) => incrementButtonRef = ref, 'onClick': (_) => count.setWithUpdater((prev) => prev + 1)},
-                ['+']),
             react.button({
-              'ref': (ref) => reRenderButtonRef = ref,
+              'ref': (ref) => incrementButtonRef = ref as ButtonElement,
+              'onClick': (_) => count.setWithUpdater((prev) => prev + 1),
+            }, [
+              '+'
+            ]),
+            react.button({
+              'ref': (ref) => reRenderButtonRef = ref as ButtonElement,
               'onClick': (_) => reRender.setWithUpdater((prev) => prev + 1)
             }, [
               're-render'
@@ -644,7 +643,7 @@ main() {
 
     group('useImperativeHandle -', () {
       group('updates `ref.current` to the return value of `createHandle()`', () {
-        var mountNode = DivElement();
+        final mountNode = DivElement();
         ReactDartFunctionComponentFactoryProxy UseImperativeHandleTest;
         ButtonElement incrementButton;
         ButtonElement reRenderButtonRef1;
@@ -655,7 +654,7 @@ main() {
         StateHook<int> count;
 
         setUpAll(() {
-          var NoDepsComponent = react.forwardRef2((props, ref) {
+          final NoDepsComponent = react.forwardRef2((props, ref) {
             count = useState(0);
 
             useImperativeHandle(
@@ -666,44 +665,44 @@ main() {
             return react.div({'ref': ref}, count.value);
           });
 
-          var EmptyDepsComponent = react.forwardRef2((props, ref) {
-            var count = useState(0);
+          final EmptyDepsComponent = react.forwardRef2((props, ref) {
+            final count = useState(0);
 
             useImperativeHandle(ref, () => count.value, []);
 
             return react.Fragment({}, [
               react.div({'ref': ref}, count.value),
               react.button({
-                'ref': (ref) => reRenderButtonRef1 = ref,
+                'ref': (ref) => reRenderButtonRef1 = ref as ButtonElement,
                 'onClick': (_) => count.setWithUpdater((prev) => prev + 1),
               }, []),
             ]);
           });
 
-          var DepsComponent = react.forwardRef2((props, ref) {
-            var count = useState(0);
+          final DepsComponent = react.forwardRef2((props, ref) {
+            final count = useState(0);
 
             useImperativeHandle(ref, () => count.value, [count.value]);
 
             return react.Fragment({}, [
               react.div({'ref': ref}, count.value),
               react.button({
-                'ref': (ref) => reRenderButtonRef2 = ref,
+                'ref': (ref) => reRenderButtonRef2 = ref as ButtonElement,
                 'onClick': (_) => count.setWithUpdater((prev) => prev + 1),
               }, []),
             ]);
           });
 
-          var NullRefComponent = react.registerFunctionComponent((props) {
-            var count = useState(0);
-            Ref someRefThatIsNotSet = props['someRefThatIsNotSet'];
+          final NullRefComponent = react.registerFunctionComponent((props) {
+            final count = useState(0);
+            final someRefThatIsNotSet = props['someRefThatIsNotSet'];
 
             useImperativeHandle(someRefThatIsNotSet, () => count.value, [count.value]);
 
             return react.Fragment({}, [
               react.div({'ref': someRefThatIsNotSet}, count.value),
               react.button({
-                'ref': (ref) => reRenderButtonRef2 = ref,
+                'ref': (ref) => reRenderButtonRef2 = ref as ButtonElement,
                 'onClick': (_) => count.setWithUpdater((prev) => prev + 1),
               }, []),
             ]);
@@ -713,7 +712,7 @@ main() {
               reason: 'Hook should not throw if the ref is null');
           react_dom.unmountComponentAtNode(mountNode);
 
-          UseImperativeHandleTest = react.registerFunctionComponent((Map props) {
+          UseImperativeHandleTest = react.registerFunctionComponent((props) {
             noDepsRef = useRef();
             emptyDepsRef = useRef();
             depsRef = useRef();
@@ -721,7 +720,7 @@ main() {
             return react.Fragment({}, [
               NoDepsComponent({'ref': noDepsRef}, []),
               react.button({
-                'ref': (ref) => incrementButton = ref,
+                'ref': (ref) => incrementButton = ref as ButtonElement,
                 'onClick': (_) => noDepsRef.current['increment'](),
               }, [
                 '+'
@@ -781,7 +780,7 @@ main() {
       StateHook<bool> isOnline1;
       StateHook<bool> isOnline2;
 
-      StateHook useFriendStatus() {
+      StateHook<bool> useFriendStatus() {
         final isOnline = useState(false);
 
         useDebugValue(isOnline.value ? 'Online' : 'Not Online');
@@ -789,10 +788,10 @@ main() {
         return isOnline;
       }
 
-      StateHook useFriendStatusWithFormatFunction() {
+      StateHook<bool> useFriendStatusWithFormatFunction() {
         final isOnline = useState(true);
 
-        useDebugValue(isOnline.value, (value) => value ? 'Online' : 'Not Online');
+        useDebugValue<bool>(isOnline.value, (value) => value ? 'Online' : 'Not Online');
 
         return isOnline;
       }
@@ -800,7 +799,7 @@ main() {
       setUpAll(() {
         final mountNode = DivElement();
 
-        UseDebugValueTest1 = react.registerFunctionComponent((Map props) {
+        UseDebugValueTest1 = react.registerFunctionComponent((props) {
           isOnline1 = useFriendStatus();
 
           return react.li({
@@ -810,7 +809,7 @@ main() {
           ]);
         });
 
-        UseDebugValueTest2 = react.registerFunctionComponent((Map props) {
+        UseDebugValueTest2 = react.registerFunctionComponent((props) {
           isOnline2 = useFriendStatusWithFormatFunction();
 
           return react.li({
@@ -850,17 +849,19 @@ main() {
 ReactDartComponentFactoryProxy2 ContextProviderWrapper = react.registerComponent2(() => _ContextProviderWrapper());
 
 class _ContextProviderWrapper extends react.Component2 {
+  @override
   get initialState {
     return {'counter': 1};
   }
 
   increment() {
-    this.setState({'counter': state['counter'] + 1});
+    setState({'counter': state['counter'] + 1});
   }
 
+  @override
   render() {
     return react.div({}, [
-      props['contextToUse']
+      (props['contextToUse'] as Context)
           .Provider({'value': props['mode'] == 'increment' ? state['counter'] : props['value']}, props['children'])
     ]);
   }
@@ -891,7 +892,7 @@ void testEffectHook(Function effectHook) {
     useEffectWithEmptyDepsCallCount = 0;
     useEffectCleanupWithEmptyDepsCallCount = 0;
 
-    UseEffectTest = react.registerFunctionComponent((Map props) {
+    UseEffectTest = react.registerFunctionComponent((props) {
       final count = useState(0);
       final countDown = useState(0);
 
@@ -926,7 +927,7 @@ void testEffectHook(Function effectHook) {
       return react.div({}, [
         react.div({
           'ref': (ref) {
-            countRef = ref;
+            countRef = ref as DivElement;
           },
         }, [
           count.value
@@ -936,7 +937,7 @@ void testEffectHook(Function effectHook) {
             count.set(count.value + 1);
           },
           'ref': (ref) {
-            countButtonRef = ref;
+            countButtonRef = ref as ButtonElement;
           },
         }, [
           '+'
diff --git a/test/js_builds/shared_tests.dart b/test/js_builds/shared_tests.dart
index 4d51e254..72d57583 100644
--- a/test/js_builds/shared_tests.dart
+++ b/test/js_builds/shared_tests.dart
@@ -13,11 +13,11 @@ import 'package:react/react_client/react_interop.dart';
 import 'package:test/test.dart';
 
 void verifyJsFileLoaded(String filename) {
-  var isLoaded = document.getElementsByTagName('script').any((script) {
+  final isLoaded = document.getElementsByTagName('script').any((script) {
     return Uri.parse((script as ScriptElement).src).pathSegments.last == filename;
   });
 
-  if (!isLoaded) throw new Exception('$filename is not loaded');
+  if (!isLoaded) throw Exception('$filename is not loaded');
 }
 
 void sharedJsFunctionTests() {
@@ -57,9 +57,7 @@ void sharedConsoleWarnTests({@required bool expectDeduplicateSyntheticEventWarni
   group('console.warn wrapper (or lack thereof)', () {
     void clearConsoleWarnCalls() => consoleWarnCalls = [];
 
-    setUp(() {
-      clearConsoleWarnCalls();
-    });
+    setUp(clearConsoleWarnCalls);
 
     test('warns as expected with any number of arguments', () {
       consoleWarn('foo');
@@ -88,13 +86,14 @@ void sharedConsoleWarnTests({@required bool expectDeduplicateSyntheticEventWarni
 
     void triggerRealDdcSyntheticEventWarning<T extends react.SyntheticEvent>() {
       if (T == react.SyntheticEvent) {
-        throw ArgumentError("T must a subclass of SyntheticEvent, not SyntheticEvent itself, for this to reproduce.");
+        throw ArgumentError('T must a subclass of SyntheticEvent, not SyntheticEvent itself, for this to reproduce.');
       }
 
       // Adapted from reduced test case in https://github.com/dart-lang/sdk/issues/43939
-      dynamic function = (react.SyntheticEvent event) {};
+      // ignore: prefer_function_declarations_over_variables
+      final function = (react.SyntheticEvent event) {} as dynamic;
       // ignore: unused_local_variable
-      dynamic Function(T) function2 = function;
+      final function2 = function as dynamic Function(T);
     }
 
     group('(DDC only)', () {
@@ -196,19 +195,19 @@ final _ErrorBoundary = react.registerComponent2(() => _ErrorBoundaryComponent(),
 
 class _ErrorBoundaryComponent extends react.Component2 {
   @override
-  Map get initialState => {'hasError': false};
+  get initialState => {'hasError': false};
 
   @override
-  Map getDerivedStateFromError(dynamic error) => {'hasError': true};
+  getDerivedStateFromError(dynamic error) => {'hasError': true};
 
   @override
-  void componentDidCatch(dynamic error, ReactErrorInfo info) {
+  componentDidCatch(dynamic error, ReactErrorInfo info) {
     props['onComponentDidCatch'](error, info);
   }
 
   @override
   render() {
-    return state['hasError'] ? null : props['children'];
+    return (state['hasError'] as bool) ? null : props['children'];
   }
 }
 
@@ -216,7 +215,7 @@ final _ThrowingComponent = react.registerComponent(() => _ThrowingComponentCompo
 
 class _ThrowingComponentComponent extends react.Component {
   @override
-  String get displayName => r'DisplayName$_ThrowingComponentComponent';
+  get displayName => r'DisplayName$_ThrowingComponentComponent';
 
   @override
   render() {
@@ -228,7 +227,7 @@ final _ThrowingComponent2 = react.registerComponent2(() => _ThrowingComponent2Co
 
 class _ThrowingComponent2Component extends react.Component2 {
   @override
-  String get displayName => r'DisplayName$_ThrowingComponent2Component';
+  get displayName => r'DisplayName$_ThrowingComponent2Component';
 
   @override
   render() {
diff --git a/test/lifecycle_test.dart b/test/lifecycle_test.dart
index 86a0dd9a..58ef358a 100644
--- a/test/lifecycle_test.dart
+++ b/test/lifecycle_test.dart
@@ -8,7 +8,7 @@ import 'dart:convert';
 import 'dart:html';
 import 'dart:js';
 
-import "package:js/js.dart";
+import 'package:js/js.dart';
 import 'package:meta/meta.dart';
 import 'package:react/react.dart' as react;
 import 'package:react/react_client.dart';
@@ -43,11 +43,11 @@ main() {
 
       test('throws when setState is called with something other than a Map or Function that accepts two parameters',
           () {
-        var mountNode = new DivElement();
-        var renderedInstance = react_dom.render(components.SetStateTest({}), mountNode);
-        LifecycleTestHelper component = getDartComponent(renderedInstance);
+        final mountNode = DivElement();
+        final renderedInstance = react_dom.render(components.SetStateTest({}), mountNode);
+        final component = getDartComponent<LifecycleTestHelper>(renderedInstance);
 
-        expect(() => component.setState(new Map()), returnsNormally);
+        expect(() => component.setState({}), returnsNormally);
         expect(
             () => component.setState((_, __) {
                   return {};
@@ -61,7 +61,7 @@ main() {
 
       group('prevents concurrent modification of `_setStateCallbacks`', () {
         LifecycleTestHelper component;
-        const Map initialState = const {
+        const initialState = {
           'initialState': 'initial',
         };
         int firstStateUpdateCalls;
@@ -132,18 +132,18 @@ main() {
 
       group('propTypes', () {
         bool consoleErrorCalled;
-        String consoleErrorMessage;
+        dynamic consoleErrorMessage;
         JsFunction originalConsoleError;
         DivElement mountNode;
-        final String expectedWarningPrefix = 'Warning: Failed prop type: Invalid argument(s): intProp should be int. ';
+        const expectedWarningPrefix = 'Warning: Failed prop type: Invalid argument(s): intProp should be int. ';
 
         setUp(() {
           consoleErrorCalled = false;
           consoleErrorMessage = null;
-          mountNode = new DivElement();
+          mountNode = DivElement();
           react_interop.PropTypes.resetWarningCache();
-          originalConsoleError = context['console']['error'];
-          context['console']['error'] = new JsFunction.withThis((self, message) {
+          originalConsoleError = context['console']['error'] as JsFunction;
+          context['console']['error'] = JsFunction.withThis((self, message) {
             consoleErrorCalled = true;
             consoleErrorMessage = message;
 
@@ -184,14 +184,14 @@ main() {
             expect(consoleErrorCalled, isTrue, reason: 'should have outputted a warning');
             expect(
               consoleErrorMessage,
-              contains(expectedWarningPrefix),
+              allOf(isA<String>(), contains(expectedWarningPrefix)),
               reason: 'Did the warning message change? This test will break if the format cannot be converted to json.',
             );
-            RegExp regExp = new RegExp(r'.*?({.*}).*', multiLine: true);
-            var matches = regExp.allMatches(consoleErrorMessage);
+            final regExp = RegExp(r'.*?({.*}).*', multiLine: true);
+            final matches = regExp.allMatches(consoleErrorMessage as String);
             expect(matches, hasLength(1), reason: 'Should have found a json structure in the error.');
-            var match = matches.elementAt(0); // => extract the first (and only) match
-            Map errorArgs = json.decode(match.group(1));
+            final match = matches.elementAt(0); // => extract the first (and only) match
+            final errorArgs = json.decode(match.group(1)) as Map;
             expect(errorArgs, {
               'props': '{intProp: test, children: []}',
               'propName': 'intProp',
@@ -204,16 +204,16 @@ main() {
       });
 
       test('updates with correct lifecycle calls when `forceUpdate` is called', () {
-        const Map initialState = const {
+        const initialState = {
           'initialState': 'initial',
         };
 
-        final Map initialProps =
+        final initialProps =
             unmodifiableMap({'getInitialState': (_) => initialState, 'initialState': (_) => initialState});
 
-        final Map expectedProps = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
+        final expectedProps = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
 
-        LifecycleTestHelper component = getDartComponent(render(components2.LifecycleTest(initialProps)));
+        final component = getDartComponent<LifecycleTestHelper>(render(components2.LifecycleTest(initialProps)));
 
         component.lifecycleCalls.clear();
 
@@ -231,7 +231,7 @@ main() {
 
       group('componentDidUpdate receives the same value created in getSnapshotBeforeUpdate when snapshot is', () {
         void testSnapshotType(dynamic expectedSnapshot) {
-          LifecycleTestHelper component = getDartComponent(
+          final component = getDartComponent<LifecycleTestHelper>(
               render(components2.LifecycleTest({'getSnapshotBeforeUpdate': (_, __, ___) => expectedSnapshot})));
           component.lifecycleCalls.clear();
           component.setState({});
@@ -250,30 +250,30 @@ main() {
 
       group('getDerivedStateFromProps returns', () {
         test('derived state, resulting in an updated instance state value', () {
-          const Map initialDerivedState = const {
+          const initialDerivedState = {
             'initialDerivedState': 'initial',
           };
 
-          const Map updatedDerivedState = const {
+          const updatedDerivedState = {
             'initialDerivedState': 'updated',
           };
 
-          final Map initialProps = unmodifiableMap({
+          final initialProps = unmodifiableMap({
             'getDerivedStateFromProps': (_, __, ___) => initialDerivedState,
             'defaultProp': 'default',
             'children': []
           });
 
-          final Map updatedProps = unmodifiableMap({
+          final updatedProps = unmodifiableMap({
             'getDerivedStateFromProps': (_, __, ___) => updatedDerivedState,
             'defaultProp': 'default',
             'children': []
           });
 
-          var mountNode = new DivElement();
+          final mountNode = DivElement();
           var instance = react_dom.render(components2.LifecycleTest(initialProps), mountNode);
 
-          LifecycleTestHelper component = getDartComponent(instance);
+          var component = getDartComponent<LifecycleTestHelper>(instance);
 
           expect(
               component.lifecycleCalls,
@@ -301,21 +301,21 @@ main() {
         });
 
         test('null, leaving the existing instance state value intact', () {
-          const Map initialState = const {
+          const initialState = {
             'foo': 'sudo',
           };
-          final Map initialProps = unmodifiableMap({
+          final initialProps = unmodifiableMap({
             'getDerivedStateFromProps': (_, __, ___) => null,
             'getInitialState': (_) => initialState,
             'initialState': (_) => initialState,
           });
 
-          final Map expectedProps = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
+          final expectedProps = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
 
-          var mountNode = new DivElement();
-          var instance = react_dom.render(components2.LifecycleTest(initialProps), mountNode);
+          final mountNode = DivElement();
+          final instance = react_dom.render(components2.LifecycleTest(initialProps), mountNode);
 
-          LifecycleTestHelper component = getDartComponent(instance);
+          final component = getDartComponent<LifecycleTestHelper>(instance);
 
           component.lifecycleCalls.clear();
 
@@ -333,11 +333,11 @@ main() {
       });
 
       test('triggers error lifecycle events when an error is thrown', () {
-        var mountNode = new DivElement();
-        var renderedInstance = react_dom.render(components2.SetStateTest({}), mountNode);
-        LifecycleTestHelper component = getDartComponent(renderedInstance);
+        final mountNode = DivElement();
+        final renderedInstance = react_dom.render(components2.SetStateTest({}), mountNode);
+        final component = getDartComponent<LifecycleTestHelper>(renderedInstance);
         LifecycleTestHelper.staticLifecycleCalls.clear();
-        component.setState({"shouldThrow": true});
+        component.setState({'shouldThrow': true});
 
         // First render throws an error, caught by `getDerivedStateFromError`.
         // `getDerivedStateFromError` sets state, starting the update cycle
@@ -362,28 +362,28 @@ main() {
               'getSnapshotBeforeUpdate',
               'componentDidUpdate'
             ]));
-        expect(component.state["shouldThrow"], isFalse,
+        expect(component.state['shouldThrow'], isFalse,
             reason: 'applies the state returned by `getDerivedStateFromError`');
       });
 
       test('handles null return value from getDerivedStateFromError as expected', () {
-        final Map initialState = {
+        const initialState = {
           'originalState': true,
         };
         var _shouldThrow = true;
-        final Map initialProps = unmodifiableMap({
+        final initialProps = unmodifiableMap({
           'initialState': (_) => initialState,
           'getDerivedStateFromError': (_, __) => null,
           'render': (_) {
             if (_shouldThrow) {
               _shouldThrow = false;
-              return components2.ErrorComponent({"key": "errorComp"});
+              return components2.ErrorComponent({'key': 'errorComp'});
             }
             return react.div({});
           }
         });
 
-        LifecycleTestHelper component = getDartComponent(render(components2.ErrorLifecycleTest(initialProps)));
+        final component = getDartComponent<LifecycleTestHelper>(render(components2.ErrorLifecycleTest(initialProps)));
 
         expect(
             component.lifecycleCallMemberNames,
@@ -403,16 +403,16 @@ main() {
       });
 
       test('handles unimplemented getDerivedStateFromError as expected when not included in skipMethods', () {
-        final Map initialState = {
+        const initialState = {
           'originalState': true,
         };
         var _shouldThrow = true;
-        final Map initialProps = unmodifiableMap({
+        final initialProps = unmodifiableMap({
           'initialState': (_) => initialState,
           'render': (_) {
             if (_shouldThrow) {
               _shouldThrow = false;
-              return components2.ErrorComponent({"key": "errorComp"});
+              return components2.ErrorComponent({'key': 'errorComp'});
             }
             return react.div({});
           }
@@ -441,11 +441,11 @@ main() {
       });
 
       test('error lifecycle methods get passed Dartified Error/Exception when an error is thrown', () {
-        var mountNode = new DivElement();
-        var renderedInstance = react_dom.render(components2.SetStateTest({}), mountNode);
-        LifecycleTestHelper component = getDartComponent(renderedInstance);
+        final mountNode = DivElement();
+        final renderedInstance = react_dom.render(components2.SetStateTest({}), mountNode);
+        final component = getDartComponent<LifecycleTestHelper>(renderedInstance);
         LifecycleTestHelper.staticLifecycleCalls.clear();
-        component.setState({"shouldThrow": true});
+        component.setState({'shouldThrow': true});
 
         expect(
             component.lifecycleCalls,
@@ -454,16 +454,16 @@ main() {
                   args: [isA<components2.TestDartException>(), isA<react_interop.ReactErrorInfo>()]),
               matchCall('getDerivedStateFromError', args: [isA<components2.TestDartException>()]),
             ]));
-        expect(component.state["shouldThrow"], isFalse,
+        expect(component.state['shouldThrow'], isFalse,
             reason: 'applies the state returned by `getDerivedStateFromError`');
       });
 
       test('can skip methods passed into _registerComponent2', () {
-        var mountNode = new DivElement();
-        var renderedInstance = react_dom.render(components2.SkipMethodsTest({}), mountNode);
-        LifecycleTestHelper component = getDartComponent(renderedInstance);
+        final mountNode = DivElement();
+        final renderedInstance = react_dom.render(components2.SkipMethodsTest({}), mountNode);
+        final component = getDartComponent<LifecycleTestHelper>(renderedInstance);
         LifecycleTestHelper.staticLifecycleCalls.clear();
-        component.setState({"shouldThrow": true});
+        component.setState({'shouldThrow': true});
 
         expect(
             component.lifecycleCallMemberNames,
@@ -486,12 +486,12 @@ main() {
       });
 
       test('passes the correct error/info to lifecycle methods when an error is thrown', () {
-        var mountNode = new DivElement();
-        var renderedInstance = react_dom.render(components2.SetStateTest({}), mountNode);
-        LifecycleTestHelper component = getDartComponent(renderedInstance);
-        Element renderedNode = react_dom.findDOMNode(renderedInstance);
+        final mountNode = DivElement();
+        final renderedInstance = react_dom.render(components2.SetStateTest({}), mountNode);
+        final component = getDartComponent<LifecycleTestHelper>(renderedInstance);
+        final renderedNode = findDomNode(renderedInstance);
         LifecycleTestHelper.staticLifecycleCalls.clear();
-        component.setState({"shouldThrow": true});
+        component.setState({'shouldThrow': true});
 
         expect(renderedNode.children[1].text, contains(getComponent2ErrorMessage()));
         // Because the stacktrace will be different between JS and Dart, in
@@ -505,13 +505,13 @@ main() {
       });
 
       test('defaults toward not being an error boundary', () {
-        var mountNode = new DivElement();
+        final mountNode = DivElement();
 
         expect(() {
-          var renderedInstance = react_dom.render(components2.DefaultSkipMethodsTest({}), mountNode);
-          LifecycleTestHelper component = getDartComponent(renderedInstance);
+          final renderedInstance = react_dom.render(components2.DefaultSkipMethodsTest({}), mountNode);
+          final component = getDartComponent<LifecycleTestHelper>(renderedInstance);
           LifecycleTestHelper.staticLifecycleCalls.clear();
-          component.setState({"shouldThrow": true});
+          component.setState({'shouldThrow': true});
         }, throwsA(anything));
       });
     });
@@ -527,20 +527,20 @@ main() {
         ReactDartFunctionComponentFactoryProxy PropsTest;
 
         setUpAll(() {
-          PropsTest = react.registerFunctionComponent((Map props) {
+          PropsTest = react.registerFunctionComponent((props) {
             return [props['testProp'], props['children']];
           });
         });
 
         test('renders correctly', () {
-          var testProps = {'testProp': 'test'};
+          const testProps = {'testProp': 'test'};
           react_dom.render(PropsTest(testProps, ['Child']), mountNode);
           expect(mountNode.innerHtml, 'testChild');
         });
 
         test('updates on rerender with new props', () {
-          var testProps = {'testProp': 'test'};
-          var updatedProps = {'testProp': 'test2'};
+          const testProps = {'testProp': 'test'};
+          const updatedProps = {'testProp': 'test2'};
           react_dom.render(PropsTest(testProps, ['Child']), mountNode);
           expect(mountNode.innerHtml, 'testChild');
           react_dom.render(PropsTest(updatedProps, ['Child']), mountNode);
@@ -554,7 +554,7 @@ main() {
 
         setUp(() {
           propTypeCheck = null;
-          PropsArgTypeTest = react.registerFunctionComponent((Map props) {
+          PropsArgTypeTest = react.registerFunctionComponent((props) {
             propTypeCheck = props;
             return null;
           });
@@ -592,9 +592,9 @@ void sharedLifecycleTests<T extends react.Component>({
         expect(staticHelperInstance.staticGetDefaultPropsCallCount, 0);
 
         // Need to run registerComponent in this test, which is what calls getDefaultProps.
-        ReactDartComponentFactoryProxy DefaultPropsTest =
-            react.registerComponent(defaultPropsCachingTestComponentFactory);
-        var components = [
+        final DefaultPropsTest =
+            react.registerComponent(defaultPropsCachingTestComponentFactory) as ReactDartComponentFactoryProxy;
+        final components = [
           render(DefaultPropsTest({})),
           render(DefaultPropsTest({})),
           render(DefaultPropsTest({})),
@@ -606,17 +606,17 @@ void sharedLifecycleTests<T extends react.Component>({
 
       group('are merged into props when the ReactElement is created when', () {
         test('the specified props are empty', () {
-          var props = getDartElementProps(DefaultPropsTest({}));
+          final props = getDartElementProps(DefaultPropsTest({}));
           expect(props, containsPair('defaultProp', 'default'));
         });
 
         test('the default props are overridden', () {
-          var props = getDartElementProps(DefaultPropsTest({'defaultProp': 'overridden'}));
+          final props = getDartElementProps(DefaultPropsTest({'defaultProp': 'overridden'}));
           expect(props, containsPair('defaultProp', 'overridden'));
         });
 
         test('non-default props are added', () {
-          var props = getDartElementProps(DefaultPropsTest({'otherProp': 'other'}));
+          final props = getDartElementProps(DefaultPropsTest({'otherProp': 'other'}));
           expect(props, containsPair('defaultProp', 'default'));
           expect(props, containsPair('otherProp', 'other'));
         });
@@ -624,17 +624,17 @@ void sharedLifecycleTests<T extends react.Component>({
 
       group('are merged into props by the time the Dart Component is rendered when', () {
         test('the specified props are empty', () {
-          var props = getDartComponentProps(render(DefaultPropsTest({})));
+          final props = getDartComponentProps(render(DefaultPropsTest({})));
           expect(props, containsPair('defaultProp', 'default'));
         });
 
         test('the default props are overridden', () {
-          var props = getDartComponentProps(render(DefaultPropsTest({'defaultProp': 'overridden'})));
+          final props = getDartComponentProps(render(DefaultPropsTest({'defaultProp': 'overridden'})));
           expect(props, containsPair('defaultProp', 'overridden'));
         });
 
         test('non-default props are added', () {
-          var props = getDartComponentProps(render(DefaultPropsTest({'otherProp': 'other'})));
+          final props = getDartComponentProps(render(DefaultPropsTest({'otherProp': 'other'})));
           expect(props, containsPair('defaultProp', 'default'));
           expect(props, containsPair('otherProp', 'other'));
         });
@@ -642,7 +642,7 @@ void sharedLifecycleTests<T extends react.Component>({
     });
 
     test('receives correct lifecycle calls on component mount', () {
-      LifecycleTestHelper component = getDartComponent(render(LifecycleTest({})));
+      final component = getDartComponent<LifecycleTestHelper>(render(LifecycleTest({})));
       if (!isComponent2) {
         expect(
             component.lifecycleCalls,
@@ -665,9 +665,9 @@ void sharedLifecycleTests<T extends react.Component>({
     });
 
     test('receives correct lifecycle calls on component unmount order', () {
-      var mountNode = new DivElement();
-      var instance = react_dom.render(LifecycleTest({}), mountNode);
-      LifecycleTestHelper component = getDartComponent(instance);
+      final mountNode = DivElement();
+      final instance = react_dom.render(LifecycleTest({}), mountNode);
+      final component = getDartComponent<LifecycleTestHelper>(instance);
 
       component.lifecycleCalls.clear();
 
@@ -682,10 +682,10 @@ void sharedLifecycleTests<T extends react.Component>({
 
     if (!isComponent2) {
       test('does not call getChildContext when childContextKeys is empty', () {
-        var mountNode = new DivElement();
-        var instance =
+        final mountNode = DivElement();
+        final instance =
             react_dom.render(ContextWrapperWithoutKeys({'foo': false}, LifecycleTestWithContext({})), mountNode);
-        LifecycleTestHelper component = getDartComponent(instance);
+        final component = getDartComponent<LifecycleTestHelper>(instance);
 
         expect(
             component.lifecycleCalls,
@@ -698,9 +698,9 @@ void sharedLifecycleTests<T extends react.Component>({
       });
 
       test('calls getChildContext when childContextKeys exist', () {
-        var mountNode = new DivElement();
-        var instance = react_dom.render(ContextWrapper({'foo': false}, LifecycleTestWithContext({})), mountNode);
-        LifecycleTestHelper component = getDartComponent(instance);
+        final mountNode = DivElement();
+        final instance = react_dom.render(ContextWrapper({'foo': false}, LifecycleTestWithContext({})), mountNode);
+        final component = getDartComponent<LifecycleTestHelper>(instance);
 
         expect(
             component.lifecycleCalls,
@@ -714,43 +714,43 @@ void sharedLifecycleTests<T extends react.Component>({
       });
 
       test('receives updated context with correct lifecycle calls', () {
-        LifecycleTestHelper component;
+        final componentRef = react.createRef<LifecycleTestHelper>();
 
-        Map initialProps = {'foo': false, 'initialProp': 'initial', 'children': const []};
-        Map newProps = {
-          'children': const [],
+        const initialProps = {'foo': false, 'initialProp': 'initial', 'children': []};
+        const newProps = {
+          'children': [],
           'foo': true,
           'newProp': 'new',
         };
 
-        final Map initialPropsWithDefaults = unmodifiableMap({}
+        final initialPropsWithDefaults = unmodifiableMap({}
           ..addAll(defaultProps)
           ..addAll(initialProps));
-        final Map newPropsWithDefaults = unmodifiableMap({}
+        final newPropsWithDefaults = unmodifiableMap({}
           ..addAll(defaultProps)
           ..addAll(newProps));
 
-        const Map expectedState = const {};
+        const expectedState = {};
 
-        const Map initialContext = const {'foo': false};
+        const initialContext = {'foo': false};
 
-        const Map expectedContext = const {'foo': true};
+        const expectedContext = {'foo': true};
 
-        Map refMap = {
-          'ref': ((ref) => component = ref),
+        final refMap = {
+          'ref': componentRef,
         };
 
         // Add the 'ref' prop separately so it isn't an expected prop since React removes it internally
-        var initialPropsWithRef = new Map.from(initialProps)..addAll(refMap);
-        var newPropsWithRef = new Map.from(newPropsWithDefaults)..addAll(refMap);
+        final initialPropsWithRef = Map.from(initialProps)..addAll(refMap);
+        final newPropsWithRef = Map.from(newPropsWithDefaults)..addAll(refMap);
 
         // Render the initial instance
-        var mountNode = new DivElement();
+        final mountNode = DivElement();
         react_dom.render(ContextWrapper({'foo': false}, LifecycleTestWithContext(initialPropsWithRef)), mountNode);
 
         // Verify initial context/setup
         expect(
-            component.lifecycleCalls,
+            componentRef.current.lifecycleCalls,
             equals([
               matchCall('getChildContext', props: anything, context: anything),
               matchCall('getInitialState', props: initialPropsWithDefaults, context: initialContext),
@@ -760,14 +760,14 @@ void sharedLifecycleTests<T extends react.Component>({
             ]));
 
         // Clear the lifecycle calls for to not duplicate the initial calls below
-        component.lifecycleCalls.clear();
+        componentRef.current.lifecycleCalls.clear();
 
         // Trigger a re-render with new content
         react_dom.render(ContextWrapper({'foo': true}, LifecycleTestWithContext(newPropsWithRef)), mountNode);
 
         // Verify updated context/setup
         expect(
-            component.lifecycleCalls,
+            componentRef.current.lifecycleCalls,
             equals([
               matchCall('getChildContext', props: anything, context: anything),
               matchCall('componentWillReceiveProps',
@@ -799,24 +799,24 @@ void sharedLifecycleTests<T extends react.Component>({
 
     if (isComponent2) {
       test('receives updated context with correct lifecycle calls', () {
-        LifecycleTestHelper component;
+        final componentRef = react.createRef<LifecycleTestHelper>();
 
-        const Map expectedState = const {};
+        const expectedState = {};
 
-        const Map initialContext = const {'foo': false};
+        const initialContext = {'foo': false};
 
-        const Map expectedContext = const {'foo': true};
+        const expectedContext = {'foo': true};
 
-        Map refMap = {
-          'ref': ((ref) => component = ref),
+        final refMap = {
+          'ref': componentRef,
         };
 
-        var initialProps = new Map.from(defaultProps)..addAll({'children': const []});
+        final initialProps = Map.from(defaultProps)..addAll({'children': const []});
         // Add the 'ref' prop separately so it isn't an expected prop since React removes it internally
-        var initialPropsWithRef = new Map.from(initialProps)..addAll(refMap);
+        final initialPropsWithRef = Map.from(initialProps)..addAll(refMap);
 
         // Render the initial instance
-        var mountNode = new DivElement();
+        final mountNode = DivElement();
         react_dom.render(
             ContextWrapper(
               {'foo': false},
@@ -828,7 +828,7 @@ void sharedLifecycleTests<T extends react.Component>({
 
         // Verify initial context/setup
         expect(
-            component.lifecycleCalls,
+            componentRef.current.lifecycleCalls,
             equals([
               matchCall('initialState', props: initialProps, context: initialContext),
               matchCall('getDerivedStateFromProps', args: [initialProps, expectedState]),
@@ -837,7 +837,7 @@ void sharedLifecycleTests<T extends react.Component>({
             ]));
 
         // Clear the lifecycle calls for to not duplicate the initial calls below
-        component.lifecycleCalls.clear();
+        componentRef.current.lifecycleCalls.clear();
 
         // Trigger a re-render with new content
         react_dom.render(
@@ -851,7 +851,7 @@ void sharedLifecycleTests<T extends react.Component>({
 
         // Verify updated context/setup
         expect(
-            component.lifecycleCalls,
+            componentRef.current.lifecycleCalls,
             equals([
               matchCall('getDerivedStateFromProps', args: [initialProps, expectedState]),
               matchCall('render', props: initialProps, context: expectedContext),
@@ -863,33 +863,33 @@ void sharedLifecycleTests<T extends react.Component>({
       });
 
       test('receives updated context with correct lifecycle calls when wrapped with a consumer', () {
-        LifecycleTestHelper component;
+        final componentRef = react.createRef<LifecycleTestHelper>();
 
-        const Map expectedState = const {};
+        const expectedState = {};
 
-        Map initialContext = {'foo': false};
+        const initialContext = {'foo': false};
 
-        Map expectedContext = {'foo': true};
+        const expectedContext = {'foo': true};
 
-        Map refMap = {
-          'ref': ((ref) => component = ref),
+        final refMap = {
+          'ref': componentRef,
         };
 
-        var initialProps = new Map.from(defaultProps)
+        final initialProps = Map.from(defaultProps)
           ..addAll(initialContext)
           ..addAll({'children': const []});
         // Add the 'ref' prop separately so it isn't an expected prop since React removes it internally
-        var initialPropsWithRef = new Map.from(initialProps)..addAll(refMap);
+        final initialPropsWithRef = Map.from(initialProps)..addAll(refMap);
 
-        var expectedProps = new Map.from(initialProps)..addAll(expectedContext);
+        final expectedProps = Map.from(initialProps)..addAll(expectedContext);
         // Render the initial instance
-        var mountNode = new DivElement();
+        final mountNode = DivElement();
         react_dom.render(
             ContextWrapper(
               initialContext,
               [
                 ContextConsumerWrapper({}, [
-                  (value) {
+                  (Map value) {
                     return LifecycleTest(initialPropsWithRef..addAll(value));
                   }
                 ]),
@@ -899,7 +899,7 @@ void sharedLifecycleTests<T extends react.Component>({
 
         // Verify initial context/setup
         expect(
-            component.lifecycleCalls,
+            componentRef.current.lifecycleCalls,
             equals([
               matchCall('initialState', props: initialProps),
               matchCall('getDerivedStateFromProps'),
@@ -908,7 +908,7 @@ void sharedLifecycleTests<T extends react.Component>({
             ]));
 
         // Clear the lifecycle calls for to not duplicate the initial calls below
-        component.lifecycleCalls.clear();
+        componentRef.current.lifecycleCalls.clear();
 
         // Trigger a re-render with new content3
         react_dom.render(
@@ -916,7 +916,7 @@ void sharedLifecycleTests<T extends react.Component>({
               expectedContext,
               [
                 ContextConsumerWrapper({}, [
-                  (value) {
+                  (Map value) {
                     return LifecycleTest(initialPropsWithRef..addAll(value));
                   }
                 ]),
@@ -926,7 +926,7 @@ void sharedLifecycleTests<T extends react.Component>({
 
         // Verify updated context/setup
         expect(
-            component.lifecycleCalls,
+            componentRef.current.lifecycleCalls,
             equals([
               matchCall('getDerivedStateFromProps', args: [expectedProps, expectedState]),
               matchCall('shouldComponentUpdate', args: [expectedProps, expectedState], props: initialProps),
@@ -938,23 +938,23 @@ void sharedLifecycleTests<T extends react.Component>({
     }
 
     test('receives updated props with correct lifecycle calls and defaults properly merged in', () {
-      const Map initialProps = const {'initialProp': 'initial', 'children': const []};
-      const Map newProps = const {'newProp': 'new', 'children': const []};
+      const initialProps = {'initialProp': 'initial', 'children': []};
+      const newProps = {'newProp': 'new', 'children': []};
 
-      final Map initialPropsWithDefaults = unmodifiableMap({}
+      final initialPropsWithDefaults = unmodifiableMap({}
         ..addAll(defaultProps)
         ..addAll(initialProps));
-      final Map newPropsWithDefaults = unmodifiableMap({}
+      final newPropsWithDefaults = unmodifiableMap({}
         ..addAll(defaultProps)
         ..addAll(newProps));
 
-      const Map expectedState = const {};
+      const expectedState = {};
       final dynamic expectedContext = isComponent2 ? null : const {};
-      const Null expectedSnapshot = null;
+      const expectedSnapshot = null;
 
-      var mountNode = new DivElement();
-      var instance = react_dom.render(LifecycleTest(initialProps), mountNode);
-      LifecycleTestHelper component = getDartComponent(instance);
+      final mountNode = DivElement();
+      final instance = react_dom.render(LifecycleTest(initialProps), mountNode);
+      final component = getDartComponent<LifecycleTestHelper>(instance);
 
       component.lifecycleCalls.clear();
 
@@ -999,13 +999,13 @@ void sharedLifecycleTests<T extends react.Component>({
 
     if (isComponent2) {
       test('initializes state with the value set by `initialState`', () {
-        const Map initialState = const {
+        const initialState = {
           'initialState': 'initial',
         };
 
-        final Map initialProps = unmodifiableMap({'initialState': (_) => initialState});
-        final Map expectedProps = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
-        LifecycleTestHelper component = getDartComponent(render(LifecycleTest(initialProps)));
+        final initialProps = unmodifiableMap({'initialState': (_) => initialState});
+        final expectedProps = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
+        final component = getDartComponent<LifecycleTestHelper>(render(LifecycleTest(initialProps)));
 
         expect(
             component.lifecycleCalls,
@@ -1020,21 +1020,21 @@ void sharedLifecycleTests<T extends react.Component>({
     }
 
     group('updates state with correct lifecycle calls', () {
-      const Map initialState = const {
+      const initialState = {
         'initialState': 'initial',
       };
-      const Map newState = const {
+      const newState = {
         'initialState': 'initial',
         'newState': 'new',
       };
-      const Map stateDelta = const {
+      const stateDelta = {
         'newState': 'new',
       };
 
       Map initialProps;
       Map expectedProps;
       dynamic newContext;
-      Null expectedSnapshot;
+      void expectedSnapshot;
       bool updatingStateWithNull;
       LifecycleTestHelper component;
 
@@ -1050,7 +1050,7 @@ void sharedLifecycleTests<T extends react.Component>({
       });
 
       tearDown(() {
-        var expectedState = updatingStateWithNull ? initialState : newState;
+        final expectedState = updatingStateWithNull ? initialState : newState;
         expect(
             component.lifecycleCalls,
             (updatingStateWithNull && isComponent2)
@@ -1085,12 +1085,12 @@ void sharedLifecycleTests<T extends react.Component>({
       });
 
       test('setState with updater argument', () {
-        var calls = [];
+        final calls = [];
         Map stateUpdater(Map prevState, Map props) {
           calls.add({
             'name': 'stateUpdater',
-            'prevState': new Map.from(prevState),
-            'props': new Map.from(props),
+            'prevState': Map.from(prevState),
+            'props': Map.from(props),
           });
           return stateDelta;
         }
@@ -1118,12 +1118,12 @@ void sharedLifecycleTests<T extends react.Component>({
 
       test('setStateWithUpdater argument that returns null (no re-render)', () {
         updatingStateWithNull = true;
-        var calls = [];
+        final calls = [];
         Map stateUpdater(Map prevState, Map props) {
           calls.add({
             'name': 'stateUpdater',
-            'prevState': new Map.from(prevState),
-            'props': new Map.from(props),
+            'prevState': Map.from(prevState),
+            'props': Map.from(props),
           });
           return null;
         }
@@ -1151,20 +1151,20 @@ void sharedLifecycleTests<T extends react.Component>({
     });
 
     test('updates state with correct lifecycle calls when `redraw` is called', () {
-      const Map initialState = const {
+      const initialState = {
         'initialState': 'initial',
       };
 
-      final Map initialProps =
+      final initialProps =
           unmodifiableMap({'initialState': (_) => initialState, 'getInitialState': (_) => initialState});
 
       final dynamic newContext = isComponent2 ? null : const {};
 
-      final Map expectedProps = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
+      final expectedProps = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
 
-      final Null expectedSnapshot = null;
+      const expectedSnapshot = null;
 
-      LifecycleTestHelper component = getDartComponent(render(LifecycleTest(initialProps)));
+      final component = getDartComponent<LifecycleTestHelper>(render(LifecycleTest(initialProps)));
 
       component.lifecycleCalls.clear();
 
@@ -1198,7 +1198,7 @@ void sharedLifecycleTests<T extends react.Component>({
 
     group('prevents concurrent modification of `_setStateCallbacks`', () {
       LifecycleTestHelper component;
-      const Map initialState = const {
+      const initialState = {
         'initialState': 'initial',
       };
       int firstStateUpdateCalls;
@@ -1266,33 +1266,33 @@ void sharedLifecycleTests<T extends react.Component>({
 
     if (!isComponent2) {
       test('properly handles a call to setState within componentWillReceiveProps', () {
-        const Map initialState = const {
+        const initialState = {
           'initialState': 'initial',
         };
-        const Map newState = const {
+        const newState = {
           'initialState': 'initial',
           'newState': 'new',
         };
-        const Map stateDelta = const {
+        const stateDelta = {
           'newState': 'new',
         };
-        const Map expectedContext = const {};
+        const expectedContext = {};
 
-        final Map lifecycleTestProps = unmodifiableMap({
+        final lifecycleTestProps = unmodifiableMap({
           'getInitialState': (_) => initialState,
           'componentWillReceiveProps': (LifecycleTestHelper component, Map props) {
             component.setState(stateDelta);
           },
         });
-        final Map initialProps = unmodifiableMap({'initialProp': 'initial'}, lifecycleTestProps);
-        final Map newProps = unmodifiableMap({'newProp': 'new'}, lifecycleTestProps);
+        final initialProps = unmodifiableMap({'initialProp': 'initial'}, lifecycleTestProps);
+        final newProps = unmodifiableMap({'newProp': 'new'}, lifecycleTestProps);
 
-        final Map initialPropsWithDefaults = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
-        final Map newPropsWithDefaults = unmodifiableMap(defaultProps, newProps, emptyChildrenProps);
+        final initialPropsWithDefaults = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
+        final newPropsWithDefaults = unmodifiableMap(defaultProps, newProps, emptyChildrenProps);
 
-        var mountNode = new DivElement();
-        var instance = react_dom.render(LifecycleTest(initialProps), mountNode);
-        LifecycleTestHelper component = getDartComponent(instance);
+        final mountNode = DivElement();
+        final instance = react_dom.render(LifecycleTest(initialProps), mountNode);
+        final component = getDartComponent<LifecycleTestHelper>(instance);
 
         component.lifecycleCalls.clear();
 
@@ -1334,28 +1334,28 @@ void sharedLifecycleTests<T extends react.Component>({
     void testShouldUpdates({bool shouldComponentUpdateWithContext, bool shouldComponentUpdate}) {
       test('receives updated props with correct lifecycle calls and does not rerender', () {
         final dynamic expectedContext = isComponent2 ? null : const {};
-        final Map initialProps = unmodifiableMap({
+        final initialProps = unmodifiableMap({
           'shouldComponentUpdate': (_, __, ___) => shouldComponentUpdate,
           'shouldComponentUpdateWithContext': (_, __, ___, ____) => shouldComponentUpdateWithContext,
           'initialProp': 'initial',
           'children': const []
         });
-        const Map newProps = const {'newProp': 'new', 'children': const []};
+        const newProps = {'newProp': 'new', 'children': []};
 
-        final Map initialPropsWithDefaults = unmodifiableMap(defaultProps, initialProps);
-        final Map newPropsWithDefaults = unmodifiableMap(defaultProps, newProps);
+        final initialPropsWithDefaults = unmodifiableMap(defaultProps, initialProps);
+        final newPropsWithDefaults = unmodifiableMap(defaultProps, newProps);
 
-        const Map expectedState = const {};
+        const expectedState = {};
 
-        var mountNode = new DivElement();
-        var instance = react_dom.render(LifecycleTest(initialProps), mountNode);
-        LifecycleTestHelper component = getDartComponent(instance);
+        final mountNode = DivElement();
+        final instance = react_dom.render(LifecycleTest(initialProps), mountNode);
+        final component = getDartComponent<LifecycleTestHelper>(instance);
 
         component.lifecycleCalls.clear();
 
         react_dom.render(LifecycleTest(newProps), mountNode);
 
-        List calls = [
+        final calls = [
           isComponent2 ? matchCall('getDerivedStateFromProps', args: [newPropsWithDefaults, expectedState]) : null,
           isComponent2
               ? null
@@ -1384,27 +1384,27 @@ void sharedLifecycleTests<T extends react.Component>({
 
       test('updates state with correct lifecycle calls and does not rerender', () {
         final dynamic expectedContext = isComponent2 ? null : const {};
-        const Map initialState = const {
+        const initialState = {
           'initialState': 'initial',
         };
-        const Map newState = const {
+        const newState = {
           'initialState': 'initial',
           'newState': 'new',
         };
-        const Map stateDelta = const {
+        const stateDelta = {
           'newState': 'new',
         };
 
-        final Map initialProps = unmodifiableMap({
+        final initialProps = unmodifiableMap({
           'getInitialState': (_) => initialState,
           'initialState': (_) => initialState,
           'shouldComponentUpdate': (_, __, ___) => shouldComponentUpdate,
           'shouldComponentUpdateWithContext': (_, __, ___, ____) => shouldComponentUpdateWithContext,
         });
 
-        final Map expectedProps = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
+        final expectedProps = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
 
-        LifecycleTestHelper component = getDartComponent(render(LifecycleTest(initialProps)));
+        final component = getDartComponent<LifecycleTestHelper>(render(LifecycleTest(initialProps)));
         component.lifecycleCalls.clear();
 
         component.setState(stateDelta);
@@ -1433,18 +1433,18 @@ void sharedLifecycleTests<T extends react.Component>({
 
       if (!isComponent2) {
         test('properly handles a call to setState within componentWillReceiveProps and does not rerender', () {
-          const Map initialState = const {
+          const initialState = {
             'initialState': 'initial',
           };
-          const Map newState = const {
+          const newState = {
             'initialState': 'initial',
             'newState': 'new',
           };
-          const Map stateDelta = const {
+          const stateDelta = {
             'newState': 'new',
           };
 
-          final Map lifecycleTestProps = unmodifiableMap({
+          final lifecycleTestProps = unmodifiableMap({
             'shouldComponentUpdate': (_, __, ___) => shouldComponentUpdate,
             'shouldComponentUpdateWithContext': (_, __, ___, ____) => shouldComponentUpdateWithContext,
             'getInitialState': (_) => initialState,
@@ -1452,23 +1452,23 @@ void sharedLifecycleTests<T extends react.Component>({
               component.setState(stateDelta);
             },
           });
-          final Map initialProps = unmodifiableMap({'initialProp': 'initial'}, lifecycleTestProps);
-          final Map newProps = unmodifiableMap({'newProp': 'new'}, lifecycleTestProps);
+          final initialProps = unmodifiableMap({'initialProp': 'initial'}, lifecycleTestProps);
+          final newProps = unmodifiableMap({'newProp': 'new'}, lifecycleTestProps);
 
-          final Map initialPropsWithDefaults = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
-          final Map newPropsWithDefaults = unmodifiableMap(defaultProps, newProps, emptyChildrenProps);
+          final initialPropsWithDefaults = unmodifiableMap(defaultProps, initialProps, emptyChildrenProps);
+          final newPropsWithDefaults = unmodifiableMap(defaultProps, newProps, emptyChildrenProps);
 
-          final Map expectedContext = const {};
+          const expectedContext = {};
 
-          var mountNode = new DivElement();
-          var instance = react_dom.render(LifecycleTest(initialProps), mountNode);
-          LifecycleTestHelper component = getDartComponent(instance);
+          final mountNode = DivElement();
+          final instance = react_dom.render(LifecycleTest(initialProps), mountNode);
+          final component = getDartComponent<LifecycleTestHelper>(instance);
 
           component.lifecycleCalls.clear();
 
           react_dom.render(LifecycleTest(newProps), mountNode);
 
-          List calls = [
+          final calls = [
             matchCall('componentWillReceiveProps',
                 args: [newPropsWithDefaults], props: initialPropsWithDefaults, state: initialState),
             skipLegacyContextTests
@@ -1511,8 +1511,8 @@ void sharedLifecycleTests<T extends react.Component>({
       LifecycleTestHelper component;
 
       setUp(() {
-        var mountNode = new DivElement();
-        var renderedInstance = react_dom.render(SetStateTest({}), mountNode);
+        final mountNode = DivElement();
+        final renderedInstance = react_dom.render(SetStateTest({}), mountNode);
         component = getDartComponent(renderedInstance);
         component.lifecycleCalls.clear();
       });
@@ -1540,10 +1540,10 @@ void sharedLifecycleTests<T extends react.Component>({
 
     group('calls the setState callback, and transactional setState callback in the correct order', () {
       test('when shouldComponentUpdate returns false', () {
-        var mountNode = new DivElement();
-        var renderedInstance = react_dom.render(SetStateTest({'shouldUpdate': false}), mountNode);
-        Element renderedNode = react_dom.findDOMNode(renderedInstance);
-        LifecycleTestHelper component = getDartComponent(renderedInstance);
+        final mountNode = DivElement();
+        final renderedInstance = react_dom.render(SetStateTest({'shouldUpdate': false}), mountNode);
+        final renderedNode = findDomNode(renderedInstance);
+        final component = getDartComponent<LifecycleTestHelper>(renderedInstance);
 
         react_test_utils.Simulate.click(renderedNode.children.first);
         // todo directly assert state change occured to aid in test debugging
@@ -1563,10 +1563,10 @@ void sharedLifecycleTests<T extends react.Component>({
       });
 
       test('when shouldComponentUpdate returns true', () {
-        var mountNode = new DivElement();
-        var renderedInstance = react_dom.render(SetStateTest({}), mountNode);
-        Element renderedNode = react_dom.findDOMNode(renderedInstance);
-        LifecycleTestHelper component = getDartComponent(renderedInstance);
+        final mountNode = DivElement();
+        final renderedInstance = react_dom.render(SetStateTest({}), mountNode);
+        final renderedNode = findDomNode(renderedInstance);
+        final component = getDartComponent<LifecycleTestHelper>(renderedInstance);
 
         react_test_utils.Simulate.click(renderedNode.children.first);
         // todo directly assert state change occured to aid in test debugging
diff --git a/test/lifecycle_test/component.dart b/test/lifecycle_test/component.dart
index 6f56342d..afc295c1 100644
--- a/test/lifecycle_test/component.dart
+++ b/test/lifecycle_test/component.dart
@@ -2,20 +2,20 @@
 @JS()
 library react.lifecycle_test.component;
 
-import "package:js/js.dart";
+import 'package:js/js.dart';
 import 'package:react/react.dart' as react;
 import 'package:react/react_client.dart';
 
 import 'util.dart';
 
-ReactDartComponentFactoryProxy SetStateTest = react.registerComponent(() => new _SetStateTest());
+final SetStateTest = react.registerComponent(() => _SetStateTest()) as ReactDartComponentFactoryProxy;
 
 class _SetStateTest extends react.Component with LifecycleTestHelper {
   @override
-  Map getDefaultProps() => {'shouldUpdate': true};
+  getDefaultProps() => const {'shouldUpdate': true};
 
   @override
-  getInitialState() => {"counter": 1};
+  getInitialState() => const {'counter': 1};
 
   @override
   componentWillReceiveProps(_) {
@@ -58,6 +58,7 @@ class _SetStateTest extends react.Component with LifecycleTestHelper {
     lifecycleCalls.add(name);
   }
 
+  @override
   render() {
     recordLifecyleCall('render');
 
@@ -80,25 +81,28 @@ class _SetStateTest extends react.Component with LifecycleTestHelper {
   }
 }
 
-_DefaultPropsCachingTest defaultPropsCachingTestComponentFactory() => new _DefaultPropsCachingTest();
+_DefaultPropsCachingTest defaultPropsCachingTestComponentFactory() => _DefaultPropsCachingTest();
 
 class _DefaultPropsCachingTest extends react.Component implements DefaultPropsCachingTestHelper {
   static int getDefaultPropsCallCount = 0;
 
-  int get staticGetDefaultPropsCallCount => getDefaultPropsCallCount;
+  @override
+  get staticGetDefaultPropsCallCount => getDefaultPropsCallCount;
 
   @override
   set staticGetDefaultPropsCallCount(int value) => getDefaultPropsCallCount = value;
 
-  Map getDefaultProps() {
+  @override
+  getDefaultProps() {
     getDefaultPropsCallCount++;
     return {'getDefaultPropsCallCount': getDefaultPropsCallCount};
   }
 
-  render() => false;
+  @override
+  render() => null;
 }
 
-ReactDartComponentFactoryProxy DefaultPropsTest = react.registerComponent(() => new _DefaultPropsTest());
+final DefaultPropsTest = react.registerComponent(() => _DefaultPropsTest()) as ReactDartComponentFactoryProxy;
 
 class _DefaultPropsTest extends react.Component {
   static int getDefaultPropsCallCount = 0;
@@ -107,20 +111,22 @@ class _DefaultPropsTest extends react.Component {
   /// class is not known.
   int get staticGetDefaultPropsCallCount => getDefaultPropsCallCount;
 
-  Map getDefaultProps() => {'defaultProp': 'default'};
+  @override
+  getDefaultProps() => {'defaultProp': 'default'};
 
-  render() => false;
+  @override
+  render() => null;
 }
 
-ReactDartComponentFactoryProxy ContextWrapperWithoutKeys =
-    react.registerComponent(() => new _ContextWrapperWithoutKeys());
+final ContextWrapperWithoutKeys =
+    react.registerComponent(() => _ContextWrapperWithoutKeys()) as ReactDartComponentFactoryProxy;
 
 class _ContextWrapperWithoutKeys extends react.Component with LifecycleTestHelper {
   @override
-  Iterable<String> get childContextKeys => const [];
+  get childContextKeys => const [];
 
   @override
-  Map<String, dynamic> getChildContext() {
+  getChildContext() {
     lifecycleCall('getChildContext');
     return {
       'foo': props['foo'],
@@ -128,17 +134,18 @@ class _ContextWrapperWithoutKeys extends react.Component with LifecycleTestHelpe
     };
   }
 
-  dynamic render() => react.div({}, props['children']);
+  @override
+  render() => react.div({}, props['children']);
 }
 
-ReactDartComponentFactoryProxy ContextWrapper = react.registerComponent(() => new _ContextWrapper());
+final ContextWrapper = react.registerComponent(() => _ContextWrapper()) as ReactDartComponentFactoryProxy;
 
 class _ContextWrapper extends react.Component with LifecycleTestHelper {
   @override
-  Iterable<String> get childContextKeys => const ['foo', 'extraContext'];
+  get childContextKeys => const ['foo', 'extraContext'];
 
   @override
-  Map<String, dynamic> getChildContext() {
+  getChildContext() {
     lifecycleCall('getChildContext');
     return {
       'foo': props['foo'],
@@ -146,54 +153,64 @@ class _ContextWrapper extends react.Component with LifecycleTestHelper {
     };
   }
 
-  dynamic render() => react.div({}, props['children']);
+  @override
+  render() => react.div({}, props['children']);
 }
 
-ReactDartComponentFactoryProxy LifecycleTestWithContext =
-    react.registerComponent(() => new _LifecycleTestWithContext());
+final LifecycleTestWithContext =
+    react.registerComponent(() => _LifecycleTestWithContext()) as ReactDartComponentFactoryProxy;
 
 class _LifecycleTestWithContext extends _LifecycleTest {
   @override
-  Iterable<String> get contextKeys => const ['foo']; // only listening to one context key
+  get contextKeys => const ['foo']; // only listening to one context key
 }
 
-ReactDartComponentFactoryProxy LifecycleTest = react.registerComponent(() => new _LifecycleTest());
+final LifecycleTest = react.registerComponent(() => _LifecycleTest()) as ReactDartComponentFactoryProxy;
 
 class _LifecycleTest extends react.Component with LifecycleTestHelper {
-  void componentWillMount() => lifecycleCall('componentWillMount');
-  void componentDidMount() => lifecycleCall('componentDidMount');
-  void componentWillUnmount() => lifecycleCall('componentWillUnmount');
+  @override
+  componentWillMount() => lifecycleCall('componentWillMount');
+  @override
+  componentDidMount() => lifecycleCall('componentDidMount');
+  @override
+  componentWillUnmount() => lifecycleCall('componentWillUnmount');
 
-  void componentWillReceiveProps(newProps) =>
-      lifecycleCall('componentWillReceiveProps', arguments: [new Map.from(newProps)]);
+  @override
+  componentWillReceiveProps(newProps) => lifecycleCall('componentWillReceiveProps', arguments: [Map.from(newProps)]);
 
-  void componentWillReceivePropsWithContext(newProps, newContext) =>
-      lifecycleCall('componentWillReceivePropsWithContext',
-          arguments: [new Map.from(newProps), new Map.from(newContext)]);
+  @override
+  componentWillReceivePropsWithContext(newProps, newContext) => lifecycleCall('componentWillReceivePropsWithContext',
+      arguments: [Map.from(newProps), Map.from(newContext as Map)]);
 
-  void componentWillUpdate(nextProps, nextState) =>
-      lifecycleCall('componentWillUpdate', arguments: [new Map.from(nextProps), new Map.from(nextState)]);
+  @override
+  componentWillUpdate(nextProps, nextState) =>
+      lifecycleCall('componentWillUpdate', arguments: [Map.from(nextProps), Map.from(nextState)]);
 
-  void componentWillUpdateWithContext(nextProps, nextState, nextContext) =>
-      lifecycleCall('componentWillUpdateWithContext',
-          arguments: [new Map.from(nextProps), new Map.from(nextState), new Map.from(nextContext)]);
+  @override
+  componentWillUpdateWithContext(nextProps, nextState, nextContext) => lifecycleCall('componentWillUpdateWithContext',
+      arguments: [Map.from(nextProps), Map.from(nextState), Map.from(nextContext)]);
 
-  void componentDidUpdate(prevProps, prevState) =>
-      lifecycleCall('componentDidUpdate', arguments: [new Map.from(prevProps), new Map.from(prevState)]);
+  @override
+  componentDidUpdate(prevProps, prevState) =>
+      lifecycleCall('componentDidUpdate', arguments: [Map.from(prevProps), Map.from(prevState)]);
 
-  bool shouldComponentUpdate(nextProps, nextState) => lifecycleCall('shouldComponentUpdate',
-      arguments: [new Map.from(nextProps), new Map.from(nextState)], defaultReturnValue: () => true);
+  @override
+  shouldComponentUpdate(nextProps, nextState) => lifecycleCall('shouldComponentUpdate',
+      arguments: [Map.from(nextProps), Map.from(nextState)], defaultReturnValue: () => true);
 
-  bool shouldComponentUpdateWithContext(nextProps, nextState, nextContext) =>
+  @override
+  shouldComponentUpdateWithContext(nextProps, nextState, nextContext) =>
       lifecycleCall('shouldComponentUpdateWithContext',
-          arguments: [new Map.from(nextProps), new Map.from(nextState), new Map.from(nextContext)],
-          defaultReturnValue: () => true);
+          arguments: [Map.from(nextProps), Map.from(nextState), Map.from(nextContext)], defaultReturnValue: () => true);
 
-  dynamic render() => lifecycleCall('render', defaultReturnValue: () => react.div({}));
+  @override
+  render() => lifecycleCall('render', defaultReturnValue: () => react.div({}));
 
-  Map getInitialState() => lifecycleCall('getInitialState', defaultReturnValue: () => {});
+  @override
+  getInitialState() => lifecycleCall('getInitialState', defaultReturnValue: () => {});
 
-  Map getDefaultProps() {
+  @override
+  getDefaultProps() {
     lifecycleCall('getDefaultProps');
 
     return {'defaultProp': 'default'};
diff --git a/test/lifecycle_test/component2.dart b/test/lifecycle_test/component2.dart
index 8531db05..dcd9abbd 100644
--- a/test/lifecycle_test/component2.dart
+++ b/test/lifecycle_test/component2.dart
@@ -2,15 +2,15 @@
 @JS()
 library react.lifecycle_test.component2;
 
-import "package:js/js.dart";
+import 'package:js/js.dart';
 import 'package:react/react.dart' as react;
 import 'package:react/react_client/react_interop.dart';
 
 import 'util.dart';
 
-final SetStateTest = react.registerComponent2(() => new _SetStateTest(), skipMethods: [null]);
-final DefaultSkipMethodsTest = react.registerComponent2(() => new _SetStateTest());
-final SkipMethodsTest = react.registerComponent2(() => new _SetStateTest(), skipMethods: ['getSnapshotBeforeUpdate']);
+final SetStateTest = react.registerComponent2(() => _SetStateTest(), skipMethods: [null]);
+final DefaultSkipMethodsTest = react.registerComponent2(() => _SetStateTest());
+final SkipMethodsTest = react.registerComponent2(() => _SetStateTest(), skipMethods: ['getSnapshotBeforeUpdate']);
 
 class _SetStateTest extends react.Component2 with LifecycleTestHelper {
   @override
@@ -28,7 +28,7 @@ class _SetStateTest extends react.Component2 with LifecycleTestHelper {
       };
 
   @override
-  Map getDerivedStateFromProps(_, __) {
+  getDerivedStateFromProps(_, __) {
     lifecycleCall('getDerivedStateFromProps');
     return {};
   }
@@ -52,13 +52,13 @@ class _SetStateTest extends react.Component2 with LifecycleTestHelper {
   @override
   componentDidCatch(dynamic error, ReactErrorInfo info) {
     lifecycleCall('componentDidCatch', arguments: [error, info]);
-    this.setState({'error': error, 'info': info.componentStack});
+    setState({'error': error, 'info': info.componentStack});
   }
 
   @override
-  Map getDerivedStateFromError(error) {
+  getDerivedStateFromError(error) {
     lifecycleCall('getDerivedStateFromError', arguments: [error]);
-    return {"shouldThrow": false, "errorFromGetDerivedState": error};
+    return {'shouldThrow': false, 'errorFromGetDerivedState': error};
   }
 
   Map outerTransactionalSetStateCallback(Map previousState, __) {
@@ -71,10 +71,13 @@ class _SetStateTest extends react.Component2 with LifecycleTestHelper {
     return {'counter': previousState['counter'] + 1};
   }
 
+  bool get shouldThrow => state['shouldThrow'] as bool;
+
+  @override
   render() {
     lifecycleCall('render');
 
-    if (!state['shouldThrow']) {
+    if (!shouldThrow) {
       return react.div({
         'onClick': (_) {
           setStateWithUpdater(outerTransactionalSetStateCallback, () {
@@ -110,45 +113,51 @@ class _SetStateTest extends react.Component2 with LifecycleTestHelper {
               });
             }
           }, [
-            state["shouldThrow"] ? ErrorComponent({"key": "errorComp"}) : null,
+            shouldThrow ? ErrorComponent({'key': 'errorComp'}) : null,
             state['counter']
           ]));
     }
   }
 }
 
-_DefaultPropsCachingTest defaultPropsCachingTestComponentFactory() => new _DefaultPropsCachingTest();
+_DefaultPropsCachingTest defaultPropsCachingTestComponentFactory() => _DefaultPropsCachingTest();
 
 class _DefaultPropsCachingTest extends react.Component2 implements DefaultPropsCachingTestHelper {
   static int getDefaultPropsCallCount = 0;
 
-  int get staticGetDefaultPropsCallCount => getDefaultPropsCallCount;
+  @override
+  get staticGetDefaultPropsCallCount => getDefaultPropsCallCount;
 
   @override
   set staticGetDefaultPropsCallCount(int value) => getDefaultPropsCallCount = value;
 
+  @override
   Map get defaultProps {
     getDefaultPropsCallCount++;
     return {'getDefaultPropsCallCount': getDefaultPropsCallCount};
   }
 
+  @override
   render() => false;
 }
 
-final DefaultPropsTest = react.registerComponent2(() => new _DefaultPropsTest());
+final DefaultPropsTest = react.registerComponent2(() => _DefaultPropsTest());
 
 class _DefaultPropsTest extends react.Component2 {
-  Map get defaultProps => {'defaultProp': 'default'};
+  @override
+  get defaultProps => {'defaultProp': 'default'};
 
+  @override
   render() => false;
 }
 
-final PropTypesTest = react.registerComponent2(() => new PropTypesTestComponent());
+final PropTypesTest = react.registerComponent2(() => PropTypesTestComponent());
 
 class PropTypesTestComponent extends react.Component2 {
+  @override
   get propTypes => {
         'intProp': (Map props, info) {
-          var propValue = props[info.propName];
+          final propValue = props[info.propName];
           if (propValue is! int) {
             return ArgumentError(
                 '${info.propName} should be int. {"props": "$props", "propName": "${info.propName}", "componentName": "${info.componentName}", "location": "${info.location}", "propFullName": "${info.propFullName}"}');
@@ -157,23 +166,26 @@ class PropTypesTestComponent extends react.Component2 {
         }
       };
 
+  @override
   render() => '';
 }
 
 react.Context LifecycleTestContext = react.createContext();
 
-final ContextConsumerWrapper = react.registerComponent2(() => new _ContextConsumerWrapper());
+final ContextConsumerWrapper = react.registerComponent2(() => _ContextConsumerWrapper());
 
 class _ContextConsumerWrapper extends react.Component2 with LifecycleTestHelper {
-  dynamic render() {
+  @override
+  render() {
     return LifecycleTestContext.Consumer({}, props['children'].first);
   }
 }
 
-final ContextWrapper = react.registerComponent2(() => new _ContextWrapper());
+final ContextWrapper = react.registerComponent2(() => _ContextWrapper());
 
 class _ContextWrapper extends react.Component2 with LifecycleTestHelper {
-  dynamic render() {
+  @override
+  render() {
     return LifecycleTestContext.Provider(
       {
         'value': {'foo': props['foo']}
@@ -183,14 +195,14 @@ class _ContextWrapper extends react.Component2 with LifecycleTestHelper {
   }
 }
 
-final LifecycleTestWithContext = react.registerComponent2(() => new _LifecycleTestWithContext());
+final LifecycleTestWithContext = react.registerComponent2(() => _LifecycleTestWithContext());
 
 class _LifecycleTestWithContext extends _LifecycleTest {
   @override
   get contextType => LifecycleTestContext;
 }
 
-final ErrorComponent = react.registerComponent2(() => new _ErrorComponent());
+final ErrorComponent = react.registerComponent2(() => _ErrorComponent());
 
 class TestDartException implements Exception {
   int code;
@@ -198,6 +210,7 @@ class TestDartException implements Exception {
 
   TestDartException(this.message, this.code);
 
+  @override
   toString() {
     return message;
   }
@@ -205,69 +218,91 @@ class TestDartException implements Exception {
 
 class _ErrorComponent extends react.Component2 {
   void _throwError() {
-    throw TestDartException("It crashed!", 100);
+    throw TestDartException('It crashed!', 100);
   }
 
-  void render() {
+  @override
+  render() {
     _throwError();
-    return react.div({'key': 'defaultMessage'}, "Error");
+    return react.div({'key': 'defaultMessage'}, 'Error');
   }
 }
 
-final ErrorLifecycleTest = react.registerComponent2(() => new _LifecycleTest(), skipMethods: []);
-final LifecycleTest = react.registerComponent2(() => new _LifecycleTest());
+final ErrorLifecycleTest = react.registerComponent2(() => _LifecycleTest(), skipMethods: []);
+final LifecycleTest = react.registerComponent2(() => _LifecycleTest());
 
 class _LifecycleTest extends react.Component2 with LifecycleTestHelper {
-  void componentDidMount() => lifecycleCall('componentDidMount');
-  void componentWillUnmount() => lifecycleCall('componentWillUnmount');
+  @override
+  componentDidMount() => lifecycleCall('componentDidMount');
+  @override
+  componentWillUnmount() => lifecycleCall('componentWillUnmount');
 
-  Map getDerivedStateFromProps(nextProps, prevState) => lifecycleCall('getDerivedStateFromProps',
-      arguments: [new Map.from(nextProps), new Map.from(prevState)], staticProps: nextProps);
+  @override
+  getDerivedStateFromProps(nextProps, prevState) => lifecycleCall('getDerivedStateFromProps',
+      arguments: [Map.from(nextProps), Map.from(prevState)], staticProps: nextProps);
 
-  dynamic getSnapshotBeforeUpdate(prevProps, prevState) =>
-      lifecycleCall('getSnapshotBeforeUpdate', arguments: [new Map.from(prevProps), new Map.from(prevState)]);
+  @override
+  getSnapshotBeforeUpdate(prevProps, prevState) =>
+      lifecycleCall('getSnapshotBeforeUpdate', arguments: [Map.from(prevProps), Map.from(prevState)]);
 
-  void componentDidUpdate(prevProps, prevState, [snapshot]) =>
-      lifecycleCall('componentDidUpdate', arguments: [new Map.from(prevProps), new Map.from(prevState), snapshot]);
+  @override
+  componentDidUpdate(prevProps, prevState, [snapshot]) =>
+      lifecycleCall('componentDidUpdate', arguments: [Map.from(prevProps), Map.from(prevState), snapshot]);
 
-  void componentDidCatch(error, info) => lifecycleCall('componentDidCatch', arguments: [error, info]);
+  @override
+  componentDidCatch(error, info) => lifecycleCall('componentDidCatch', arguments: [error, info]);
 
-  Map getDerivedStateFromError(error) => lifecycleCall('getDerivedStateFromError', arguments: [error]);
+  @override
+  getDerivedStateFromError(error) => lifecycleCall('getDerivedStateFromError', arguments: [error]);
 
-  bool shouldComponentUpdate(nextProps, nextState) => lifecycleCall('shouldComponentUpdate',
-      arguments: [new Map.from(nextProps), new Map.from(nextState)], defaultReturnValue: () => true);
+  @override
+  shouldComponentUpdate(nextProps, nextState) => lifecycleCall('shouldComponentUpdate',
+      arguments: [Map.from(nextProps), Map.from(nextState)], defaultReturnValue: () => true);
 
-  dynamic render() => lifecycleCall('render', defaultReturnValue: () => react.div({}));
+  @override
+  render() => lifecycleCall('render', defaultReturnValue: () => react.div({}));
 
-  Map get initialState => lifecycleCall('initialState', defaultReturnValue: () => {});
+  @override
+  get initialState => lifecycleCall('initialState', defaultReturnValue: () => {});
 
-  Map get defaultProps => lifecycleCall('defaultProps', defaultReturnValue: () => {'defaultProp': 'default'});
+  @override
+  get defaultProps => lifecycleCall('defaultProps', defaultReturnValue: () => {'defaultProp': 'default'});
 }
 
 final NoGetDerivedStateFromErrorLifecycleTest =
-    react.registerComponent2(() => new _NoGetDerivedStateFromErrorLifecycleTest(), skipMethods: []);
+    react.registerComponent2(() => _NoGetDerivedStateFromErrorLifecycleTest(), skipMethods: []);
 
 class _NoGetDerivedStateFromErrorLifecycleTest extends react.Component2 with LifecycleTestHelper {
-  void componentDidMount() => lifecycleCall('componentDidMount');
-  void componentWillUnmount() => lifecycleCall('componentWillUnmount');
+  @override
+  componentDidMount() => lifecycleCall('componentDidMount');
+  @override
+  componentWillUnmount() => lifecycleCall('componentWillUnmount');
 
-  Map getDerivedStateFromProps(nextProps, prevState) => lifecycleCall('getDerivedStateFromProps',
-      arguments: [new Map.from(nextProps), new Map.from(prevState)], staticProps: nextProps);
+  @override
+  getDerivedStateFromProps(nextProps, prevState) => lifecycleCall('getDerivedStateFromProps',
+      arguments: [Map.from(nextProps), Map.from(prevState)], staticProps: nextProps);
 
-  dynamic getSnapshotBeforeUpdate(prevProps, prevState) =>
-      lifecycleCall('getSnapshotBeforeUpdate', arguments: [new Map.from(prevProps), new Map.from(prevState)]);
+  @override
+  getSnapshotBeforeUpdate(prevProps, prevState) =>
+      lifecycleCall('getSnapshotBeforeUpdate', arguments: [Map.from(prevProps), Map.from(prevState)]);
 
-  void componentDidUpdate(prevProps, prevState, [snapshot]) =>
-      lifecycleCall('componentDidUpdate', arguments: [new Map.from(prevProps), new Map.from(prevState), snapshot]);
+  @override
+  componentDidUpdate(prevProps, prevState, [snapshot]) =>
+      lifecycleCall('componentDidUpdate', arguments: [Map.from(prevProps), Map.from(prevState), snapshot]);
 
-  void componentDidCatch(error, info) => lifecycleCall('componentDidCatch', arguments: [error, info]);
+  @override
+  componentDidCatch(error, info) => lifecycleCall('componentDidCatch', arguments: [error, info]);
 
-  bool shouldComponentUpdate(nextProps, nextState) => lifecycleCall('shouldComponentUpdate',
-      arguments: [new Map.from(nextProps), new Map.from(nextState)], defaultReturnValue: () => true);
+  @override
+  shouldComponentUpdate(nextProps, nextState) => lifecycleCall('shouldComponentUpdate',
+      arguments: [Map.from(nextProps), Map.from(nextState)], defaultReturnValue: () => true);
 
-  dynamic render() => lifecycleCall('render', defaultReturnValue: () => react.div({}));
+  @override
+  render() => lifecycleCall('render', defaultReturnValue: () => react.div({}));
 
-  Map get initialState => lifecycleCall('initialState', defaultReturnValue: () => {});
+  @override
+  get initialState => lifecycleCall('initialState', defaultReturnValue: () => {});
 
-  Map get defaultProps => lifecycleCall('defaultProps', defaultReturnValue: () => {'defaultProp': 'default'});
+  @override
+  get defaultProps => lifecycleCall('defaultProps', defaultReturnValue: () => {'defaultProp': 'default'});
 }
diff --git a/test/lifecycle_test/util.dart b/test/lifecycle_test/util.dart
index d6d3d47d..aa7a2692 100644
--- a/test/lifecycle_test/util.dart
+++ b/test/lifecycle_test/util.dart
@@ -2,10 +2,10 @@
 import 'package:matcher/matcher.dart';
 import 'package:react/react.dart';
 
-const Map defaultProps = const {'defaultProp': 'default'};
-const Map emptyChildrenProps = const {'children': const []};
+const Map defaultProps = {'defaultProp': 'default'};
+const Map emptyChildrenProps = {'children': []};
 
-Map matchCall(String memberName, {args: anything, props: anything, state: anything, context: anything}) {
+Map matchCall(String memberName, {args = anything, props = anything, state = anything, context = anything}) {
   return {
     'memberName': memberName,
     'arguments': args,
@@ -20,37 +20,33 @@ mixin LifecycleTestHelper on Component {
   static List staticLifecycleCalls = [];
 
   /// We needed to add [staticLifecycleCalls] to be able to test static
-  /// lifecycle methods like [getDerivedStateFromProps] and
-  /// [getDerivedStateFromError], which don't get called on the same instance
+  /// lifecycle methods like `getDerivedStateFromProps` and
+  /// `getDerivedStateFromError`, which don't get called on the same instance
   /// as other lifecycle methods.
   ///
-  /// This alllows static and instance lifecycle methods to add calls to the same list
+  /// This allows static and instance lifecycle methods to add calls to the same list
   List get lifecycleCalls => staticLifecycleCalls;
 
   List get lifecycleCallMemberNames => staticLifecycleCalls.map((call) {
         return call['memberName'];
       }).toList();
 
-  dynamic lifecycleCall(String memberName, {List arguments: const [], defaultReturnValue(), Map staticProps}) {
+  T lifecycleCall<T>(String memberName, {List arguments = const [], T Function() defaultReturnValue, Map staticProps}) {
     lifecycleCalls.add({
       'memberName': memberName,
       'arguments': arguments,
-      'props': props == null ? null : new Map.from(props),
-      'state': state == null ? null : new Map.from(state),
+      'props': props == null ? null : Map.from(props),
+      'state': state == null ? null : Map.from(state),
       'context': context,
     });
 
-    var lifecycleCallback = props == null
+    final lifecycleCallback = props == null
         ? staticProps == null
             ? null
             : staticProps[memberName]
         : props[memberName];
     if (lifecycleCallback != null) {
-      return Function.apply(
-          lifecycleCallback,
-          []
-            ..add(this)
-            ..addAll(arguments));
+      return Function.apply(lifecycleCallback as Function, [this, ...arguments]) as T;
     }
 
     if (defaultReturnValue != null) {
diff --git a/test/react_client/bridge_test.dart b/test/react_client/bridge_test.dart
index ca048b63..ce2945d0 100644
--- a/test/react_client/bridge_test.dart
+++ b/test/react_client/bridge_test.dart
@@ -38,13 +38,13 @@ main() {
 
     group('- Component2BridgeImpl', () {
       test('.bridgeFactory returns a const instance of Component2BridgeImpl', () {
-        expect(Component2BridgeImpl.bridgeFactory(new _Foo()), same(const Component2BridgeImpl()));
+        expect(Component2BridgeImpl.bridgeFactory(_Foo()), same(const Component2BridgeImpl()));
       });
     });
   });
 }
 
-final Foo = react.registerComponent2(() => new _Foo());
+final Foo = react.registerComponent2(() => _Foo());
 
 class _Foo extends react.Component2 {
   @override
@@ -53,8 +53,8 @@ class _Foo extends react.Component2 {
 
 List<Map> customBridgeCalls;
 
-final BridgeTest = react.registerComponent2(() => new _BridgeTest(), bridgeFactory: (component) {
-  final returnedBridge = new CustomComponent2Bridge();
+final BridgeTest = react.registerComponent2(() => _BridgeTest(), bridgeFactory: (component) {
+  final returnedBridge = CustomComponent2Bridge();
   customBridgeCalls?.add({
     'component': component,
     'returnedBridge': returnedBridge,
diff --git a/test/react_client/event_helpers_test.dart b/test/react_client/event_helpers_test.dart
index 5d4b50d0..7e5ca9a4 100644
--- a/test/react_client/event_helpers_test.dart
+++ b/test/react_client/event_helpers_test.dart
@@ -7,7 +7,6 @@ import 'package:react/react.dart';
 import 'package:react/react_client/js_interop_helpers.dart';
 import 'package:react/react_dom.dart';
 import 'package:react/react_test_utils.dart';
-import 'package:react/src/react_client/event_helpers.dart';
 import 'package:test/test.dart';
 import 'package:mockito/mockito.dart';
 
@@ -99,10 +98,10 @@ main() {
     }
 
     test('wrapNativeKeyboardEvent', () {
-      var nativeKeyboardEvent = MockKeyboardEvent();
-      var currentTarget = DivElement();
-      var target = DivElement();
-      var calls = <String>[];
+      final nativeKeyboardEvent = MockKeyboardEvent();
+      final currentTarget = DivElement();
+      final target = DivElement();
+      final calls = <String>[];
 
       when(nativeKeyboardEvent.bubbles).thenReturn(true);
       when(nativeKeyboardEvent.cancelable).thenReturn(true);
@@ -125,7 +124,7 @@ main() {
 
       expect(nativeKeyboardEvent.defaultPrevented, isFalse);
 
-      var syntheticKeyboardEvent = wrapNativeKeyboardEvent(nativeKeyboardEvent);
+      final syntheticKeyboardEvent = wrapNativeKeyboardEvent(nativeKeyboardEvent);
 
       expect(syntheticKeyboardEvent, isA<SyntheticKeyboardEvent>());
 
@@ -133,6 +132,7 @@ main() {
       expect(syntheticKeyboardEvent.cancelable, isTrue);
       expect(syntheticKeyboardEvent.currentTarget, currentTarget);
       expect(syntheticKeyboardEvent.defaultPrevented, isFalse);
+      // ignore: unnecessary_lambdas
       expect(() => syntheticKeyboardEvent.preventDefault(), returnsNormally);
       expect(calls, contains('preventDefault'));
       expect(() => syntheticKeyboardEvent.stopPropagation(), returnsNormally);
@@ -157,11 +157,11 @@ main() {
     });
 
     test('wrapNativeMouseEvent', () {
-      var nativeMouseEvent = MockMouseEvent();
-      var currentTarget = DivElement();
-      var target = DivElement();
-      var relatedTarget = DivElement();
-      var calls = <String>[];
+      final nativeMouseEvent = MockMouseEvent();
+      final currentTarget = DivElement();
+      final target = DivElement();
+      final relatedTarget = DivElement();
+      final calls = <String>[];
 
       when(nativeMouseEvent.bubbles).thenReturn(true);
       when(nativeMouseEvent.cancelable).thenReturn(true);
@@ -183,7 +183,7 @@ main() {
       when(nativeMouseEvent.page).thenReturn(Point(3, 4));
       when(nativeMouseEvent.screen).thenReturn(Point(5, 6));
 
-      var syntheticMouseEvent = wrapNativeMouseEvent(nativeMouseEvent);
+      final syntheticMouseEvent = wrapNativeMouseEvent(nativeMouseEvent);
 
       expect(syntheticMouseEvent, isA<SyntheticMouseEvent>());
 
@@ -191,6 +191,7 @@ main() {
       expect(syntheticMouseEvent.cancelable, isTrue);
       expect(syntheticMouseEvent.currentTarget, currentTarget);
       expect(syntheticMouseEvent.defaultPrevented, isFalse);
+      // ignore: unnecessary_lambdas
       expect(() => syntheticMouseEvent.preventDefault(), returnsNormally);
       expect(calls, contains('preventDefault'));
       expect(() => syntheticMouseEvent.stopPropagation(), returnsNormally);
@@ -218,8 +219,8 @@ main() {
     });
 
     test('fakeSyntheticFormEvent', () {
-      var element = DivElement();
-      var fakeEvent = fakeSyntheticFormEvent(element, 'change');
+      final element = DivElement();
+      final fakeEvent = fakeSyntheticFormEvent(element, 'change');
 
       expect(fakeEvent, isA<SyntheticFormEvent>());
 
@@ -227,6 +228,7 @@ main() {
       expect(fakeEvent.cancelable, isFalse);
       expect(fakeEvent.currentTarget, element);
       expect(fakeEvent.defaultPrevented, false);
+      // ignore: unnecessary_lambdas
       expect(() => fakeEvent.preventDefault(), returnsNormally);
       expect(() => fakeEvent.stopPropagation(), returnsNormally);
       expect(fakeEvent.eventPhase, Event.AT_TARGET);
@@ -1989,7 +1991,7 @@ main() {
 
         Element renderAndGetRootNode() {
           final mountNode = Element.div();
-          final content = div({'onDrag': (e) => event = e, 'draggable': true}, []);
+          final content = div({'onDrag': (SyntheticMouseEvent e) => event = e, 'draggable': true}, []);
           render(content, mountNode);
           return mountNode.children.single;
         }
diff --git a/test/react_client/js_backed_map_test.dart b/test/react_client/js_backed_map_test.dart
index 094469ad..1e38299d 100644
--- a/test/react_client/js_backed_map_test.dart
+++ b/test/react_client/js_backed_map_test.dart
@@ -13,7 +13,7 @@ main() {
   group('JsBackedMap', () {
     group('sets and retrieves values without JS interop interfering with them:', () {
       void testTypeValue(dynamic testValue) {
-        final jsBackedMap = new JsBackedMap();
+        final jsBackedMap = JsBackedMap();
         jsBackedMap['testValue'] = testValue;
         expect(jsBackedMap['testValue'], same(testValue));
       }
@@ -29,7 +29,7 @@ main() {
       });
 
       test('.backedBy creates a new instance backed by a given JS map', () {
-        final jsMap = jsify({'foo': 1});
+        final jsMap = jsify({'foo': 1}) as JsMap;
         final jsBackedMap = JsBackedMap.backedBy(jsMap);
         expect(jsBackedMap, containsPair('foo', 1));
 
@@ -47,7 +47,7 @@ main() {
       });
 
       test('.fromJs creates a new instance with all key-value pairs from another JS map', () {
-        final otherJsMap = jsify({'foo': 1});
+        final otherJsMap = jsify({'foo': 1}) as JsMap;
         final jsBackedMap = JsBackedMap.fromJs(otherJsMap);
         expect(jsBackedMap, containsPair('foo', 1));
         expect(jsBackedMap.jsObject, isNot(otherJsMap));
@@ -58,14 +58,14 @@ main() {
     });
 
     test('addAllFromJs adds all properties from another JS object', () {
-      final jsMap = new JsBackedMap.from({
+      final jsMap = JsBackedMap.from({
         'foo': 1,
         'bar': 2,
-      });
-      jsMap.addAllFromJs(jsify({
-        'foo': 'overwritten',
-        'baz': 3,
-      }));
+      })
+        ..addAllFromJs(jsify({
+          'foo': 'overwritten',
+          'baz': 3,
+        }) as JsMap);
       expect(jsMap, {
         'foo': 'overwritten',
         'bar': 2,
@@ -112,7 +112,7 @@ main() {
       JsBackedMap testMap;
 
       setUp(() {
-        testMap = new JsBackedMap.from({
+        testMap = JsBackedMap.from({
           'foo': 1,
           'bar': 2,
         });
@@ -140,7 +140,7 @@ main() {
         });
 
         test('with a JSBackedMap (special case)', () {
-          testMap.addAll(new JsBackedMap.from({
+          testMap.addAll(JsBackedMap.from({
             'foo': 'overwritten',
             'baz': 3,
           }));
diff --git a/test/react_client/js_interop_helpers_test.dart b/test/react_client/js_interop_helpers_test.dart
index dafe4248..18b4d315 100644
--- a/test/react_client/js_interop_helpers_test.dart
+++ b/test/react_client/js_interop_helpers_test.dart
@@ -67,11 +67,11 @@ main() {
     });
 
     test('converts an Iterable', () {
-      final set = new Set.from([1, 2, 3, 4, 5, 6, 7, 8]);
+      final set = {1, 2, 3, 4, 5, 6, 7, 8};
       final array = jsifyAndAllowInterop(set);
       expect(array is List, isTrue);
-      expect(array.length, equals(set.length));
-      for (var i = 0; i < array.length; i++) {
+      expect((array as List).length, equals(set.length));
+      for (var i = 0; i < (array as List).length; i++) {
         expect(set.contains(array[i]), isTrue);
       }
     });
diff --git a/test/react_client/react_interop_test.dart b/test/react_client/react_interop_test.dart
index c918840d..bdecc2d7 100644
--- a/test/react_client/react_interop_test.dart
+++ b/test/react_client/react_interop_test.dart
@@ -13,7 +13,7 @@ main() {
       Element mountNode;
 
       setUp(() {
-        mountNode = new DivElement();
+        mountNode = DivElement();
       });
 
       tearDown(() {
@@ -21,7 +21,7 @@ main() {
       });
 
       test('with simple children', () {
-        final portalTargetNode = new Element.div();
+        final portalTargetNode = Element.div();
         final portal = ReactDom.createPortal('foo', portalTargetNode);
         react_dom.render(portal, mountNode);
 
@@ -29,7 +29,7 @@ main() {
       });
 
       test('with nested list children', () {
-        final portalTargetNode = new Element.div();
+        final portalTargetNode = Element.div();
         final portal = ReactDom.createPortal([
           ['foo'],
           [
diff --git a/test/react_client_test.dart b/test/react_client_test.dart
index e2bd3041..e3e3670c 100644
--- a/test/react_client_test.dart
+++ b/test/react_client_test.dart
@@ -12,18 +12,18 @@ import 'package:test/test.dart';
 import 'package:react/react.dart' as react;
 import 'package:react/react_client.dart';
 import 'package:react/react_client/component_factory.dart';
-import 'package:react/react_client/react_interop.dart' show React, ReactComponent;
+import 'package:react/react_client/react_interop.dart' show React;
 import 'package:react/react_client/js_interop_helpers.dart';
 import 'package:react/react_dom.dart' as react_dom;
 import 'package:react/src/react_client/event_prop_key_to_event_factory.dart';
 
 main() {
   group('unconvertJsProps', () {
-    const List testChildren = const ['child1', 'child2'];
-    const Map<String, dynamic> testStyle = const {'background': 'white'};
+    const testChildren = ['child1', 'child2'];
+    const testStyle = <String, dynamic>{'background': 'white'};
 
     test('returns props for a composite JS component ReactElement', () {
-      ReactElement instance = testJsComponentFactory({
+      final instance = testJsComponentFactory({
         'jsProp': 'js',
         'style': testStyle,
       }, testChildren);
@@ -58,8 +58,8 @@ main() {
     });
 
     test('returns props for a composite JS ReactComponent', () {
-      var mountNode = new DivElement();
-      ReactComponent renderedInstance = react_dom.render(
+      final mountNode = DivElement();
+      final renderedInstance = react_dom.render(
           testJsComponentFactory({
             'jsProp': 'js',
             'style': testStyle,
@@ -77,8 +77,8 @@ main() {
     });
 
     test('returns props for a composite JS ReactComponent, even when the props change', () {
-      var mountNode = new DivElement();
-      ReactComponent renderedInstance = react_dom.render(
+      final mountNode = DivElement();
+      var renderedInstance = react_dom.render(
           testJsComponentFactory({
             'jsProp': 'js',
             'style': testStyle,
@@ -111,7 +111,7 @@ main() {
     });
 
     test('returns props for a DOM component ReactElement', () {
-      ReactElement instance = react.div({
+      final instance = react.div({
         'domProp': 'dom',
         'style': testStyle,
       }, testChildren);
@@ -142,8 +142,8 @@ main() {
       });
 
       test('for a DOM element', () {
-        var component = react.div(props);
-        var jsProps = unconvertJsProps(component);
+        final component = react.div(props);
+        final jsProps = unconvertJsProps(component);
         for (final key in knownEventKeys) {
           expect(jsProps[key], isNotNull, reason: 'JS event handler prop should not be null');
           expect(jsProps[key], anyOf(same(originalHandlers[key]), same(allowInterop(originalHandlers[key]))),
@@ -152,8 +152,8 @@ main() {
       });
 
       test(', except for a JS composite component (handlers should already be unconverted)', () {
-        var component = testJsComponentFactory(props);
-        var jsProps = unconvertJsProps(component);
+        final component = testJsComponentFactory(props);
+        final jsProps = unconvertJsProps(component);
         for (final key in knownEventKeys) {
           expect(jsProps[key], isNotNull, reason: 'JS event handler prop should not be null');
           expect(jsProps[key], same(allowInterop(originalHandlers[key])),
@@ -208,7 +208,7 @@ main() {
 external Function compositeComponent();
 
 /// A factory for a JS composite component, for use in testing.
-final Function testJsComponentFactory = (() {
+final testJsComponentFactory = (() {
   final type = compositeComponent();
   return ([props = const {}, children]) {
     return React.createElement(type, jsifyAndAllowInterop(props), listifyChildren(children));
@@ -217,7 +217,7 @@ final Function testJsComponentFactory = (() {
 
 class ThrowsInDefaultPropsComponent extends Component {
   @override
-  Map getDefaultProps() => throw StateError('bad default props');
+  getDefaultProps() => throw StateError('bad default props');
 
   @override
   render() {
@@ -226,6 +226,7 @@ class ThrowsInDefaultPropsComponent extends Component {
 }
 
 class ThrowsInDefaultPropsComponent2 extends Component2 {
+  @override
   get defaultProps => throw StateError('bad default props');
 
   @override
@@ -235,6 +236,7 @@ class ThrowsInDefaultPropsComponent2 extends Component2 {
 }
 
 class ThrowsInPropTypesComponent2 extends Component2 {
+  @override
   get propTypes => throw StateError('bad prop types');
 
   @override
@@ -250,7 +252,7 @@ class DartComponent2Component extends Component2 {
   }
 }
 
-final DartComponent2 = react.registerComponent2(() => new DartComponent2Component());
+final DartComponent2 = react.registerComponent2(() => DartComponent2Component());
 
 class DartComponentComponent extends Component {
   @override
@@ -259,4 +261,4 @@ class DartComponentComponent extends Component {
   }
 }
 
-ReactDartComponentFactoryProxy DartComponent = react.registerComponent(() => new DartComponentComponent());
+final DartComponent = react.registerComponent(() => DartComponentComponent()) as ReactDartComponentFactoryProxy;
diff --git a/test/react_component_test.dart b/test/react_component_test.dart
index 50fa7549..aee6d197 100644
--- a/test/react_component_test.dart
+++ b/test/react_component_test.dart
@@ -9,7 +9,7 @@ main() {
     Component2 component;
 
     setUpAll(() {
-      component = new MyComponent();
+      component = MyComponent();
     });
 
     group('throws when unsupported lifecycle methods are called (e.g., via super-calls)', () {
diff --git a/test/react_context_test.dart b/test/react_context_test.dart
index 858d984d..ba6ec791 100644
--- a/test/react_context_test.dart
+++ b/test/react_context_test.dart
@@ -14,7 +14,7 @@ import 'shared_type_tester.dart';
 
 main() {
   void testTypeValue(dynamic typeToTest) {
-    var mountNode = new html.DivElement();
+    final mountNode = html.DivElement();
     var contextTypeRef;
     var consumerRef;
     react_dom.render(
@@ -45,7 +45,7 @@ main() {
     });
 
     group('calculateChangeBits argument functions correctly', () {
-      var mountNode = new html.DivElement();
+      final mountNode = html.DivElement();
       _ContextProviderWrapper providerRef;
       _ContextConsumerWrapper consumerEvenRef;
       _ContextConsumerWrapper consumerOddRef;
@@ -56,7 +56,7 @@ main() {
               'contextToUse': TestCalculateChangedBitsContext,
               'mode': 'increment',
               'ref': (ref) {
-                providerRef = ref;
+                providerRef = ref as _ContextProviderWrapper;
               }
             }, [
               ContextConsumerWrapper({
@@ -64,7 +64,7 @@ main() {
                 'contextToUse': TestCalculateChangedBitsContext,
                 'unstable_observedBits': 1 << 2,
                 'ref': (ref) {
-                  consumerEvenRef = ref;
+                  consumerEvenRef = ref as _ContextConsumerWrapper;
                 }
               }),
               ContextConsumerWrapper({
@@ -72,7 +72,7 @@ main() {
                 'contextToUse': TestCalculateChangedBitsContext,
                 'unstable_observedBits': 1 << 3,
                 'ref': (ref) {
-                  consumerOddRef = ref;
+                  consumerOddRef = ref as _ContextConsumerWrapper;
                 }
               })
             ]),
@@ -100,7 +100,7 @@ main() {
 }
 
 int calculateChangedBits(currentValue, nextValue) {
-  int result = 0;
+  var result = 0;
   if (nextValue % 2 == 0) {
     // Bit for even values
     result |= 1 << 2;
@@ -116,43 +116,49 @@ var TestCalculateChangedBitsContext = react.createContext(1, calculateChangedBit
 
 var TestContext = react.createContext();
 
-final ContextProviderWrapper = react.registerComponent2(() => new _ContextProviderWrapper());
+final ContextProviderWrapper = react.registerComponent2(() => _ContextProviderWrapper());
 
 class _ContextProviderWrapper extends react.Component2 {
+  @override
   get initialState {
     return {'counter': 1};
   }
 
   increment() {
-    this.setState({'counter': state['counter'] + 1});
+    setState({'counter': state['counter'] + 1});
   }
 
+  @override
   render() {
     return react.div({}, [
-      props['contextToUse']
+      (props['contextToUse'] as react.Context)
           .Provider({'value': props['mode'] == 'increment' ? state['counter'] : props['value']}, props['children'])
     ]);
   }
 }
 
-final ContextConsumerWrapper = react.registerComponent2(() => new _ContextConsumerWrapper());
+final ContextConsumerWrapper = react.registerComponent2(() => _ContextConsumerWrapper());
 
 class _ContextConsumerWrapper extends react.Component2 {
   dynamic latestValue;
+  @override
   render() {
-    return props['contextToUse'].Consumer({'unstable_observedBits': props['unstable_observedBits']}, (value) {
+    return (props['contextToUse'] as react.Context).Consumer({'unstable_observedBits': props['unstable_observedBits']},
+        (value) {
       latestValue = value;
       return react.div({}, '$value');
     });
   }
 }
 
-final ContextTypeComponent = react.registerComponent2(() => new _ContextTypeComponent());
+final ContextTypeComponent = react.registerComponent2(() => _ContextTypeComponent());
 
 class _ContextTypeComponent extends react.Component2 {
+  @override
   var contextType = TestContext;
 
+  @override
   render() {
-    return react.div({}, '${this.context}');
+    return react.div({}, '$context');
   }
 }
diff --git a/test/react_fragment_test.dart b/test/react_fragment_test.dart
index 537dd849..e0f590be 100644
--- a/test/react_fragment_test.dart
+++ b/test/react_fragment_test.dart
@@ -27,7 +27,7 @@ main() {
             react.div({}),
           ])
         ]),
-        new Element.div(),
+        Element.div(),
       );
 
       expect(wrappingDivRef.children, hasLength(4));
@@ -36,7 +36,7 @@ main() {
     test('passes the key properly onto the fragment', () {
       var callCount = 0;
 
-      var mountElement = new Element.div();
+      final mountElement = Element.div();
 
       react_dom.render(
           react.Fragment({
@@ -75,9 +75,10 @@ class _FragmentTestDummy extends react.Component2 {
     props['onComponentDidMount']();
   }
 
+  @override
   render() {
     return react.button(props, 'hi');
   }
 }
 
-final FragmentTestDummy = react.registerComponent2(() => new _FragmentTestDummy());
+final FragmentTestDummy = react.registerComponent2(() => _FragmentTestDummy());
diff --git a/test/react_memo_test.dart b/test/react_memo_test.dart
index 5bc15356..66184108 100644
--- a/test/react_memo_test.dart
+++ b/test/react_memo_test.dart
@@ -80,7 +80,7 @@ void sharedMemoTests(MemoFunction memoFunction) {
             return prevProps['localCount'] == nextProps['localCount'];
           };
 
-    final MemoTest = memoFunction(react.registerFunctionComponent((Map props) {
+    final MemoTest = memoFunction(react.registerFunctionComponent((props) {
       childMemoRenderCount++;
       return react.div(
         {},
@@ -174,6 +174,7 @@ final MemoTestWrapper = react.registerComponent2(() => _MemoTestWrapperComponent
 class _MemoTestWrapperComponent extends react.Component2 {
   int redrawCount = 0;
 
+  @override
   get initialState => {
         'localCount': 0,
         'valueMemoShouldIgnoreViaAreEqual': 0,
@@ -181,20 +182,20 @@ class _MemoTestWrapperComponent extends react.Component2 {
       };
 
   @override
-  void componentDidUpdate(Map prevProps, Map prevState, [dynamic snapshot]) {
+  componentDidUpdate(Map prevProps, Map prevState, [dynamic snapshot]) {
     redrawCount++;
   }
 
   void increaseLocalCount() {
-    this.setState({'localCount': this.state['localCount'] + 1});
+    setState({'localCount': state['localCount'] + 1});
   }
 
   void increaseValueMemoShouldIgnoreViaAreEqual() {
-    this.setState({'valueMemoShouldIgnoreViaAreEqual': this.state['valueMemoShouldIgnoreViaAreEqual'] + 1});
+    setState({'valueMemoShouldIgnoreViaAreEqual': state['valueMemoShouldIgnoreViaAreEqual'] + 1});
   }
 
   void increaseValueMemoShouldNotKnowAbout() {
-    this.setState({'valueMemoShouldNotKnowAbout': this.state['valueMemoShouldNotKnowAbout'] + 1});
+    setState({'valueMemoShouldNotKnowAbout': state['valueMemoShouldNotKnowAbout'] + 1});
   }
 
   @override
@@ -202,8 +203,8 @@ class _MemoTestWrapperComponent extends react.Component2 {
     return react.div(
       {},
       props['memoComponentFactory']({
-        'localCount': this.state['localCount'],
-        'valueMemoShouldIgnoreViaAreEqual': this.state['valueMemoShouldIgnoreViaAreEqual'],
+        'localCount': state['localCount'],
+        'valueMemoShouldIgnoreViaAreEqual': state['valueMemoShouldIgnoreViaAreEqual'],
       }),
     );
   }
diff --git a/test/react_strictmode_test.dart b/test/react_strictmode_test.dart
index 39b5dae4..320ceec8 100644
--- a/test/react_strictmode_test.dart
+++ b/test/react_strictmode_test.dart
@@ -27,7 +27,7 @@ main() {
             react.div({}),
           ])
         ]),
-        new Element.div(),
+        Element.div(),
       );
 
       expect(wrappingDivRef.children, hasLength(4));
diff --git a/test/react_suspense_lazy_component.dart b/test/react_suspense_lazy_component.dart
index ceca28e1..c023532c 100644
--- a/test/react_suspense_lazy_component.dart
+++ b/test/react_suspense_lazy_component.dart
@@ -1,4 +1,3 @@
-import 'package:react/hooks.dart';
 import 'package:react/react.dart' as react;
 
 var SimpleFunctionComponent = react.registerFunctionComponent(SimpleComponent, displayName: 'simple');
diff --git a/test/react_suspense_test.dart b/test/react_suspense_test.dart
index a546461c..50ad0c22 100644
--- a/test/react_suspense_test.dart
+++ b/test/react_suspense_test.dart
@@ -22,7 +22,8 @@ external ReactClass jsLazy(Promise Function() factory);
 // Only intended for testing purposes, Please do not copy/paste this into repo.
 // This will most likely be added to the PUBLIC api in the future,
 // but needs more testing and Typing decisions to be made first.
-ReactJsComponentFactoryProxy lazy(Future<ReactComponentFactoryProxy> factory()) => ReactJsComponentFactoryProxy(
+ReactJsComponentFactoryProxy lazy(Future<ReactComponentFactoryProxy> Function() factory) =>
+    ReactJsComponentFactoryProxy(
       jsLazy(
         allowInterop(
           () => futureToPromise(
@@ -44,7 +45,7 @@ main() {
         return simple.SimpleFunctionComponent;
       });
       var wrappingDivRef;
-      var mountElement = new Element.div();
+      final mountElement = Element.div();
       react_dom.render(
         react.div({
           'ref': (ref) {
@@ -78,8 +79,8 @@ main() {
       });
       var wrappingDivRef;
       var wrappingDivRef2;
-      var mountElement = new Element.div();
-      var mountElement2 = new Element.div();
+      final mountElement = Element.div();
+      final mountElement2 = Element.div();
 
       react_dom.render(
         react.div({
diff --git a/test/react_test_utils_test.dart b/test/react_test_utils_test.dart
index e0cf8336..bd51c28d 100644
--- a/test/react_test_utils_test.dart
+++ b/test/react_test_utils_test.dart
@@ -4,8 +4,8 @@ library react_test_utils_test;
 import 'dart:html';
 import 'dart:js_util';
 
-import 'package:react/react.dart';
-import 'package:react/react_dom.dart' as react_dom;
+import 'package:react/react.dart' hide div, span;
+import 'package:react/react.dart' as react;
 import 'package:react/react_client.dart';
 import 'package:react/react_test_utils.dart';
 import 'package:test/test.dart';
@@ -15,6 +15,10 @@ import 'test_components.dart' as component1;
 import 'test_components2.dart' as component2;
 import 'util.dart';
 
+// Public APIs with tightened types to help fix implicit casts
+final div = react.div as ReactDomComponentFactoryProxy;
+final span = react.span as ReactDomComponentFactoryProxy;
+
 void main() {
   testUtils(
       isComponent2: false,
@@ -28,7 +32,12 @@ void main() {
       wrapperComponent: component2.wrapperComponent);
 }
 
-testUtils({isComponent2: false, dynamic eventComponent, dynamic sampleComponent, dynamic wrapperComponent}) {
+testUtils({
+  bool isComponent2 = false,
+  ReactComponentFactoryProxy eventComponent,
+  ReactComponentFactoryProxy sampleComponent,
+  ReactComponentFactoryProxy wrapperComponent,
+}) {
   var component;
   Element domNode;
 
@@ -48,8 +57,8 @@ testUtils({isComponent2: false, dynamic eventComponent, dynamic sampleComponent,
     });
 
     tearDown(() {
-      ReactElement renderedOutput = shallowRenderer.getRenderOutput();
-      var props = getProps(renderedOutput);
+      final renderedOutput = shallowRenderer.getRenderOutput();
+      final props = getProps(renderedOutput);
 
       expect(props['className'], 'test');
       expect(props['id'], 'createRendererTest');
@@ -67,14 +76,14 @@ testUtils({isComponent2: false, dynamic eventComponent, dynamic sampleComponent,
   group('Simulate on a Component${isComponent2 ? "2" : ""}', () {
     setUp(() {
       component = renderIntoDocument(eventComponent({}));
-      domNode = react_dom.findDOMNode(component);
+      domNode = findDomNode(component);
       expect(domNode.text, equals(''));
     });
 
     void testEvent(
-      void event(dynamic instanceOrNode, Map eventData),
+      void Function(dynamic instanceOrNode, Map eventData) event,
       String eventName,
-      void expectEventType(SyntheticEvent e),
+      void Function(SyntheticEvent e) expectEventType,
     ) {
       final eventHandlerName = 'on${eventName[0].toUpperCase() + eventName.substring(1)}';
       eventName = eventName.toLowerCase();
@@ -101,16 +110,16 @@ testUtils({isComponent2: false, dynamic eventComponent, dynamic sampleComponent,
       if (expectEventType != null) {
         test('with correct type', () {
           SyntheticEvent capturedEvent;
-          DivElement ref;
+          final ref = createRef<DivElement>();
 
           renderIntoDocument(div({
-            eventHandlerName: (e) {
+            eventHandlerName: (SyntheticEvent e) {
               capturedEvent = e;
             },
-            "ref": (r) => ref = r,
+            'ref': ref,
           }));
 
-          event(ref, eventData);
+          event(ref.current, eventData);
           expectEventType(capturedEvent);
         });
       }
@@ -205,10 +214,10 @@ testUtils({isComponent2: false, dynamic eventComponent, dynamic sampleComponent,
       const testKeyCode = 42;
 
       String callInfo;
-      bool wasStopPropagationCalled = false;
+      var wasStopPropagationCalled = false;
 
       final renderedNode = renderIntoDocument(div({
-        'onKeyDown': (event) {
+        'onKeyDown': (SyntheticKeyboardEvent event) {
           event.stopPropagation();
           callInfo = 'onKeyDown ${event.keyCode}';
         }
@@ -228,21 +237,21 @@ testUtils({isComponent2: false, dynamic eventComponent, dynamic sampleComponent,
 
   test('findRenderedDOMComponentWithClass on a Component${isComponent2 ? "2" : ""}', () {
     component = renderIntoDocument(sampleComponent({}));
-    var spanComponent = findRenderedDOMComponentWithClass(component, 'span1');
+    final spanComponent = findRenderedDOMComponentWithClass(component, 'span1');
 
     expect(getProperty(spanComponent, 'tagName'), equals('SPAN'));
   });
 
   test('findRenderedDOMComponentWithTag on a Component${isComponent2 ? "2" : ""}', () {
     component = renderIntoDocument(sampleComponent({}));
-    var h1Component = findRenderedDOMComponentWithTag(component, 'h1');
+    final h1Component = findRenderedDOMComponentWithTag(component, 'h1');
 
     expect(getProperty(h1Component, 'tagName'), equals('H1'));
   });
 
   test('findRenderedComponentWithTypeV2 on a Component${isComponent2 ? "2" : ""}', () {
     component = renderIntoDocument(wrapperComponent({}, [sampleComponent({})]));
-    var result = findRenderedComponentWithTypeV2(component, sampleComponent);
+    final result = findRenderedComponentWithTypeV2(component, sampleComponent);
     expect(isCompositeComponentWithTypeV2(result, sampleComponent), isTrue);
   });
 
@@ -261,7 +270,7 @@ testUtils({isComponent2: false, dynamic eventComponent, dynamic sampleComponent,
   });
 
   group('isCompositeComponentWithTypeV2 on a Component${isComponent2 ? "2" : ""}', () {
-    var renderedInstance = renderIntoDocument(sampleComponent({}));
+    final renderedInstance = renderIntoDocument(sampleComponent({}));
 
     test('returns true when element is a composite component (created with React.createClass()) of the specified type',
         () {
@@ -278,7 +287,7 @@ testUtils({isComponent2: false, dynamic eventComponent, dynamic sampleComponent,
   group('isDOMComponent on a Component${isComponent2 ? "2" : ""}', () {
     test('returns true when argument is a DOM component', () {
       component = renderIntoDocument(sampleComponent({}));
-      var h1Element = findRenderedDOMComponentWithTag(component, 'h1');
+      final h1Element = findRenderedDOMComponentWithTag(component, 'h1');
 
       expect(isDOMComponent(h1Element), isTrue);
     });
@@ -312,7 +321,7 @@ testUtils({isComponent2: false, dynamic eventComponent, dynamic sampleComponent,
     component =
         renderIntoDocument(wrapperComponent({}, [sampleComponent({}), sampleComponent({}), eventComponent({})]));
 
-    var results = scryRenderedComponentsWithTypeV2(component, sampleComponent);
+    final results = scryRenderedComponentsWithTypeV2(component, sampleComponent);
 
     expect(results.length, 2);
     expect(isCompositeComponentWithTypeV2(results[0], sampleComponent), isTrue);
@@ -326,7 +335,7 @@ testUtils({isComponent2: false, dynamic eventComponent, dynamic sampleComponent,
       span({})
     ]));
 
-    var results = scryRenderedDOMComponentsWithClass(component, 'divClass');
+    final results = scryRenderedDOMComponentsWithClass(component, 'divClass');
 
     expect(results.length, 2);
     expect(getProperty(results[0], 'tagName'), equals('DIV'));
@@ -336,7 +345,7 @@ testUtils({isComponent2: false, dynamic eventComponent, dynamic sampleComponent,
   test('scryRenderedDOMComponentsWithTag', () {
     component = renderIntoDocument(wrapperComponent({}, [div({}), div({}), span({})]));
 
-    var results = scryRenderedDOMComponentsWithTag(component, 'div');
+    final results = scryRenderedDOMComponentsWithTag(component, 'div');
 
     expect(results.length, 3);
     expect(getProperty(results[0], 'tagName'), equals('DIV'));
@@ -345,19 +354,19 @@ testUtils({isComponent2: false, dynamic eventComponent, dynamic sampleComponent,
   });
 
   test('renderIntoDocument with a Component${isComponent2 ? "2" : ""}', () {
-    var reactComponent = renderIntoDocument(sampleComponent({}));
-    var divElements = scryRenderedDOMComponentsWithTag(reactComponent, 'div');
-    var h1Elements = scryRenderedDOMComponentsWithTag(reactComponent, 'h1');
-    var spanElements = scryRenderedDOMComponentsWithTag(reactComponent, 'span');
+    final reactComponent = renderIntoDocument(sampleComponent({}));
+    final divElements = scryRenderedDOMComponentsWithTag(reactComponent, 'div');
+    final h1Elements = scryRenderedDOMComponentsWithTag(reactComponent, 'h1');
+    final spanElements = scryRenderedDOMComponentsWithTag(reactComponent, 'span');
 
     expect(divElements.length, equals(3));
     // First div should be the parent div created by renderIntoDocument()
-    expect(react_dom.findDOMNode(divElements[0]).text, equals('A headerFirst divSecond div'));
-    expect(react_dom.findDOMNode(divElements[1]).text, equals('First div'));
-    expect(react_dom.findDOMNode(divElements[2]).text, equals('Second div'));
+    expect(findDomNode(divElements[0]).text, equals('A headerFirst divSecond div'));
+    expect(findDomNode(divElements[1]).text, equals('First div'));
+    expect(findDomNode(divElements[2]).text, equals('Second div'));
     expect(h1Elements.length, equals(1));
-    expect(react_dom.findDOMNode(h1Elements[0]).text, equals('A header'));
+    expect(findDomNode(h1Elements[0]).text, equals('A header'));
     expect(spanElements.length, equals(1));
-    expect(react_dom.findDOMNode(spanElements[0]).text, equals(''));
+    expect(findDomNode(spanElements[0]).text, equals(''));
   });
 }
diff --git a/test/shared_type_tester.dart b/test/shared_type_tester.dart
index bd83326e..2773bea8 100644
--- a/test/shared_type_tester.dart
+++ b/test/shared_type_tester.dart
@@ -10,22 +10,22 @@ import 'package:test/test.dart';
 
 void sharedTypeTests(
   void Function(dynamic value) testTypeValue, {
-  bool skipNormalDartObjects: false,
-  bool skipDartMaps: false,
-  bool skipPrimitives: false,
-  bool skipNumTypes: false,
-  bool skipFunctions: false,
-  bool skipBrowserObjects: false,
-  bool skipLists: false,
-  bool skipDatetimes: false,
-  bool skipFutures: false,
-  bool skipJsAnonInteropTypes: false,
-  bool skipJsInteropTypes: true,
+  bool skipNormalDartObjects = false,
+  bool skipDartMaps = false,
+  bool skipPrimitives = false,
+  bool skipNumTypes = false,
+  bool skipFunctions = false,
+  bool skipBrowserObjects = false,
+  bool skipLists = false,
+  bool skipDatetimes = false,
+  bool skipFutures = false,
+  bool skipJsAnonInteropTypes = false,
+  bool skipJsInteropTypes = true,
 }) {
   if (!skipNormalDartObjects) {
     test('normal Dart objects', () {
-      final object = new Foo('f');
-      final iterable = new Iterable.generate(2);
+      final object = Foo('f');
+      final iterable = Iterable.generate(2);
       testTypeValue(object);
       testTypeValue(iterable);
     });
@@ -41,9 +41,9 @@ void sharedTypeTests(
   if (!skipPrimitives) {
     group('primitives', () {
       test('', () {
-        final stringValue = 'test';
-        final boolValue = false;
-        final nullValue = null;
+        const stringValue = 'test';
+        const boolValue = false;
+        const nullValue = null;
 
         testTypeValue(stringValue);
         testTypeValue(boolValue);
@@ -51,9 +51,9 @@ void sharedTypeTests(
       });
       if (!skipNumTypes) {
         test('num types', () {
-          final intValue = (1 as int); // ignore: unnecessary_cast
-          final doubleValue = 1.1;
-          final numValue = (1 as num); // ignore: unnecessary_cast
+          const intValue = 1 as int; // ignore: unnecessary_cast
+          const doubleValue = 1.1;
+          const numValue = 1 as num; // ignore: unnecessary_cast
 
           testTypeValue(intValue);
           testTypeValue(doubleValue);
@@ -67,8 +67,9 @@ void sharedTypeTests(
     test('functions', () {
       _functionLocalMethod() {}
       final functionLocalMethod = _functionLocalMethod;
+      // ignore: prefer_function_declarations_over_variables
       final functionExpression = () {};
-      final functionTearOff = new Object().toString;
+      final functionTearOff = Object().toString;
       final functionAllowInterop = allowInterop(() {});
 
       testTypeValue(functionLocalMethod);
@@ -80,8 +81,8 @@ void sharedTypeTests(
 
   if (!skipBrowserObjects) {
     test('browser objects', () {
-      final element = new html.DivElement();
-      final customEvent = new html.CustomEvent('foo');
+      final element = html.DivElement();
+      final customEvent = html.CustomEvent('foo');
       final window = html.window;
 
       testTypeValue(element);
@@ -102,7 +103,7 @@ void sharedTypeTests(
 
   if (!skipDatetimes) {
     test('datetimes', () {
-      final dateTime = new DateTime.utc(2018);
+      final dateTime = DateTime.utc(2018);
 
       testTypeValue(dateTime);
     });
@@ -110,7 +111,7 @@ void sharedTypeTests(
 
   if (!skipFutures) {
     test('futures', () {
-      final future = new Future(() {});
+      final future = Future(() {});
 
       testTypeValue(future);
     });
@@ -118,7 +119,7 @@ void sharedTypeTests(
 
   if (!skipJsAnonInteropTypes) {
     test('JS anonymous interop types', () {
-      final jsAnonymous = new JsTypeAnonymous();
+      final jsAnonymous = JsTypeAnonymous();
 
       testTypeValue(jsAnonymous);
     });
@@ -126,7 +127,7 @@ void sharedTypeTests(
 
   if (!skipJsInteropTypes) {
     test('JS interop types', () {
-      final jsType = new JsType();
+      final jsType = JsType();
 
       testTypeValue(jsType);
     });
diff --git a/test/test_components.dart b/test/test_components.dart
index 08b5656c..f2246634 100644
--- a/test/test_components.dart
+++ b/test/test_components.dart
@@ -1,10 +1,13 @@
 // ignore_for_file: deprecated_member_use_from_same_package
 import 'package:react/react.dart';
+import 'package:react/react_client/component_factory.dart';
 
 /// Base component for event handling classes used in test cases.
 class EventComponent extends Component {
+  @override
   getInitialState() => {'text': ''};
   onEvent(SyntheticEvent e) => setState({'text': '${e.type} ${e.timeStamp}'});
+  @override
   render() => div({
         'onAnimationEnd': onEvent,
         'onAnimationIteration': onEvent,
@@ -61,6 +64,7 @@ class EventComponent extends Component {
 }
 
 class SampleComponent extends Component {
+  @override
   render() => div(props, [
         h1({}, 'A header'),
         div({'className': 'div1'}, 'First div'),
@@ -70,11 +74,12 @@ class SampleComponent extends Component {
 }
 
 class WrapperComponent extends Component {
+  @override
   render() => div(props, props['children']);
 }
 
-final eventComponent = registerComponent(() => new EventComponent());
+final eventComponent = registerComponent(() => EventComponent()) as ReactDartComponentFactoryProxy;
 
-final sampleComponent = registerComponent(() => new SampleComponent());
+final sampleComponent = registerComponent(() => SampleComponent()) as ReactDartComponentFactoryProxy;
 
-final wrapperComponent = registerComponent(() => new WrapperComponent());
+final wrapperComponent = registerComponent(() => WrapperComponent()) as ReactDartComponentFactoryProxy;
diff --git a/test/test_components2.dart b/test/test_components2.dart
index 5ee47c72..eb57d052 100644
--- a/test/test_components2.dart
+++ b/test/test_components2.dart
@@ -3,8 +3,10 @@ import 'package:react/react.dart';
 
 /// Base component for event handling classes used in test cases.
 class EventComponent2 extends Component2 {
+  @override
   get initialState => {'text': ''};
   onEvent(SyntheticEvent e) => setState({'text': '${e.type} ${e.timeStamp}'});
+  @override
   render() => div({
         'onAnimationEnd': onEvent,
         'onAnimationIteration': onEvent,
@@ -61,6 +63,7 @@ class EventComponent2 extends Component2 {
 }
 
 class SampleComponent2 extends Component2 {
+  @override
   render() => div(props, [
         h1({}, 'A header'),
         div({'className': 'div1'}, 'First div'),
@@ -70,11 +73,12 @@ class SampleComponent2 extends Component2 {
 }
 
 class WrapperComponent2 extends Component2 {
+  @override
   render() => div(props, props['children']);
 }
 
-final eventComponent = registerComponent(() => new EventComponent2());
+final eventComponent = registerComponent2(() => EventComponent2());
 
-final sampleComponent = registerComponent(() => new SampleComponent2());
+final sampleComponent = registerComponent2(() => SampleComponent2());
 
-final wrapperComponent = registerComponent(() => new WrapperComponent2());
+final wrapperComponent = registerComponent2(() => WrapperComponent2());
diff --git a/test/util.dart b/test/util.dart
index df5a90a3..b9cfaee9 100644
--- a/test/util.dart
+++ b/test/util.dart
@@ -3,11 +3,13 @@
 @JS()
 library react.test.util;
 
+import 'dart:html';
 import 'dart:js_util' show getProperty;
 
 import 'package:js/js.dart';
 import 'package:meta/meta.dart';
 import 'package:react/react.dart' as react;
+import 'package:react/react_dom.dart' as react_dom;
 import 'package:react/react_client/js_backed_map.dart';
 import 'package:react/react_client/react_interop.dart';
 import 'package:react/react_test_utils.dart' as rtu;
@@ -15,9 +17,9 @@ import 'package:react/src/js_interop_util.dart';
 import 'package:test/test.dart';
 
 Map getProps(dynamic elementOrComponent) {
-  var props = elementOrComponent.props;
+  final props = elementOrComponent.props;
 
-  return new Map.fromIterable(objectKeys(props), value: (key) => getProperty(props, key));
+  return Map.fromIterable(objectKeys(props), value: (key) => getProperty(props, key));
 }
 
 bool isDartComponent1(ReactElement element) =>
@@ -28,34 +30,37 @@ bool isDartComponent2(ReactElement element) =>
 
 bool isDartComponent(ReactElement element) => ReactDartComponentVersion.fromType(element.type) != null;
 
-T getDartComponent<T extends react.Component>(ReactComponent dartComponent) {
-  return dartComponent.dartComponent as T;
+T getDartComponent<T extends react.Component>(dynamic dartComponent) {
+  return (dartComponent as ReactComponent).dartComponent as T;
 }
 
-Map getDartComponentProps(ReactComponent dartComponent) {
+Map getDartComponentProps(dynamic dartComponent) {
   return getDartComponent(dartComponent).props;
 }
 
 Map getDartElementProps(ReactElement dartElement) {
-  return isDartComponent2(dartElement) ? new JsBackedMap.fromJs(dartElement.props) : dartElement.props.internal.props;
+  return isDartComponent2(dartElement) ? JsBackedMap.fromJs(dartElement.props) : dartElement.props.internal.props;
 }
 
 ReactComponent render(ReactElement reactElement) {
-  return rtu.renderIntoDocument(reactElement);
+  return rtu.renderIntoDocument(reactElement) as ReactComponent;
 }
 
+// Same as the public API but with tightened types to help fix implicit casts
+Element findDomNode(dynamic component) => react_dom.findDOMNode(component) as Element;
+
 /// Returns a new [Map.unmodifiable] with all argument maps merged in.
 Map unmodifiableMap([Map map1, Map map2, Map map3, Map map4]) {
-  var merged = {};
+  final merged = {};
   if (map1 != null) merged.addAll(map1);
   if (map2 != null) merged.addAll(map2);
   if (map3 != null) merged.addAll(map3);
   if (map4 != null) merged.addAll(map4);
-  return new Map.unmodifiable(merged);
+  return Map.unmodifiable(merged);
 }
 
 bool assertsEnabled() {
-  bool assertsEnabled = false;
+  var assertsEnabled = false;
   assert(assertsEnabled = true);
   return assertsEnabled;
 }
@@ -72,7 +77,7 @@ class RefTestCase {
   /// The ref to be passed into a component.
   final dynamic ref;
 
-  /// Verifies (usually via `expect`) that the ref was updated exactly once with [actualValue].
+  /// Verifies (usually via `expect`) that the ref was updated exactly once with the provided `actualValue`.
   final Function(dynamic actualValue) verifyRefWasUpdated;
 
   /// Returns the current value of the ref.
@@ -107,7 +112,7 @@ class RefTestCaseCollection<T> {
     final calls = [];
     return RefTestCase(
       name: name,
-      ref: (value) => calls.add(value),
+      ref: calls.add,
       verifyRefWasUpdated: (actualValue) => expect(calls, [same(actualValue)], reason: _reasonMessage(name)),
       getCurrent: () => calls.single,
     );
@@ -118,13 +123,13 @@ class RefTestCaseCollection<T> {
     final calls = [];
     return RefTestCase(
       name: name,
-      ref: (T value) => calls.add(value),
+      ref: calls.add,
       verifyRefWasUpdated: (actualValue) => expect(calls, [same(actualValue)], reason: _reasonMessage(name)),
       getCurrent: () => calls.single,
     );
   }
 
-  RefTestCase createRefObjectCase<T>() {
+  RefTestCase createRefObjectCase() {
     const name = 'ref object';
     final ref = createRef<T>();
     return RefTestCase(
@@ -140,7 +145,7 @@ class RefTestCaseCollection<T> {
     final calls = [];
     return RefTestCase(
       name: name,
-      ref: allowInterop((value) => calls.add(value)),
+      ref: allowInterop(calls.add),
       verifyRefWasUpdated: (actualValue) => expect(calls, [same(actualValue)], reason: _reasonMessage(name)),
       getCurrent: () => calls.single,
       isJs: true,
@@ -175,7 +180,7 @@ class RefTestCaseCollection<T> {
         createJsRefObjectCase(),
       ];
 
-  RefTestCase createCaseByName<T>(String name) => createAllCases().singleWhere((c) => c.name == name);
+  RefTestCase createCaseByName(String name) => createAllCases().singleWhere((c) => c.name == name);
 
   List<String> get allTestCaseNames => createAllCases().map((c) => c.name).toList();
 }
diff --git a/test/util_test.dart b/test/util_test.dart
index 4b4bb9b4..c162c2c1 100644
--- a/test/util_test.dart
+++ b/test/util_test.dart
@@ -11,6 +11,9 @@ import 'util.dart';
 
 // ignore_for_file: deprecated_member_use_from_same_package, invalid_use_of_protected_member
 
+// Public APIs with tightened types to help fix implicit casts
+final div = react.div as ReactDomComponentFactoryProxy;
+
 void main() {
   group('util test', () {
     test('ReactDartComponentVersion.fromType', () {
@@ -22,7 +25,7 @@ void main() {
     });
 
     test('isDartComponent2', () {
-      expect(isDartComponent2(react.div({})), isFalse);
+      expect(isDartComponent2(div({})), isFalse);
       expect(isDartComponent2(JsFoo({})), isFalse);
       expect(isDartComponent2(Foo({})), isFalse);
       expect(isDartComponent2(Foo2({})), isTrue);
@@ -30,7 +33,7 @@ void main() {
     });
 
     test('isDartComponent1', () {
-      expect(isDartComponent1(react.div({})), isFalse);
+      expect(isDartComponent1(div({})), isFalse);
       expect(isDartComponent1(JsFoo({})), isFalse);
       expect(isDartComponent1(Foo({})), isTrue);
       expect(isDartComponent1(Foo2({})), isFalse);
@@ -38,7 +41,7 @@ void main() {
     });
 
     test('isDartComponent', () {
-      expect(isDartComponent(react.div({})), isFalse);
+      expect(isDartComponent(div({})), isFalse);
       expect(isDartComponent(JsFoo({})), isFalse);
       expect(isDartComponent(Foo({})), isTrue);
       expect(isDartComponent(Foo2({})), isTrue);
@@ -53,14 +56,14 @@ _FunctionFoo(Map props) {
   return react.div({});
 }
 
-final Foo = react.registerComponent(() => new _Foo());
+final Foo = react.registerComponent(() => _Foo()) as ReactDartComponentFactoryProxy;
 
 class _Foo extends react.Component {
   @override
   render() => react.div({});
 }
 
-final Foo2 = react.registerComponent2(() => new _Foo2());
+final Foo2 = react.registerComponent2(() => _Foo2());
 
 class _Foo2 extends react.Component2 {
   @override
diff --git a/tool/run_consumer_tests.dart b/tool/run_consumer_tests.dart
index 0fbbe09b..1c491923 100644
--- a/tool/run_consumer_tests.dart
+++ b/tool/run_consumer_tests.dart
@@ -2,8 +2,8 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 
-Future<Null> main(List<String> args) async {
-  final parser = new ArgParser()
+Future<void> main(List<String> args) async {
+  final parser = ArgParser()
     ..addOption('repoName')
     ..addOption('orgName')
     ..addOption('testCmd')
@@ -22,10 +22,10 @@ Future<Null> main(List<String> args) async {
     throw ProcessException('consumer_tests.dart', parsedArgs.arguments, '--testCmd must be provided', -1);
   }
 
-  final String repoName = parsedArgs['repoName'];
-  final String orgName = parsedArgs['orgName'];
-  final String testCmdStr = parsedArgs['testCmd'];
-  final String packageName = parsedArgs['packageName'] ?? parsedArgs['repoName'];
+  final repoName = parsedArgs['repoName'] as String;
+  final orgName = parsedArgs['orgName'] as String;
+  final testCmdStr = parsedArgs['testCmd'] as String;
+  final packageName = parsedArgs['packageName'] ?? parsedArgs['repoName'] as String;
 
   final reactGitSha = Process.runSync('git', ['rev-parse', 'HEAD']).stdout;
   print('Running $packageName tests while consuming react-dart at $reactGitSha ...\n');