diff --git a/packages/combinator/lib/src/combinator/chain.dart b/packages/combinator/lib/src/combinator/chain.dart
index 8e0552c8..49cc8c1b 100644
--- a/packages/combinator/lib/src/combinator/chain.dart
+++ b/packages/combinator/lib/src/combinator/chain.dart
@@ -22,8 +22,8 @@ class _Alt<T> extends Parser<T> {
     return result.successful
         ? result
         : result.addErrors([
-            new SyntaxError(severity ?? SyntaxErrorSeverity.error, errorMessage,
-                result.span ?? args.scanner.emptySpan),
+            new SyntaxError(
+                severity, errorMessage, result.span ?? args.scanner.emptySpan),
           ]);
   }
 
diff --git a/packages/route/lib/src/grammar.dart b/packages/route/lib/src/grammar.dart
index e2974c15..951eb438 100644
--- a/packages/route/lib/src/grammar.dart
+++ b/packages/route/lib/src/grammar.dart
@@ -192,8 +192,8 @@ class WildcardSegment extends RouteSegment {
       var items = r.value!.cast<RouteResult>();
       var a = items[0], b = items[1];
       return a
-        ..addAll(b?.params ?? {})
-        .._setTail(b?.tail);
+        ..addAll(b.params ?? {})
+        .._setTail(b.tail);
     });
   }
 }
diff --git a/packages/route/lib/src/routing_result.dart b/packages/route/lib/src/routing_result.dart
index 5d7c4b2a..03ec4f73 100644
--- a/packages/route/lib/src/routing_result.dart
+++ b/packages/route/lib/src/routing_result.dart
@@ -26,9 +26,9 @@ class RoutingResult<T> {
 
   /// The [RoutingResult] that matched the most specific sub-path.
   RoutingResult<T> get deepest {
-    RoutingResult<T> search = this;
+    var search = this;
 
-    while (search?.nested?.isNotEmpty == true) {
+    while (search.nested?.isNotEmpty == true) {
       search = search.nested!.first;
     }
 
@@ -43,9 +43,7 @@ class RoutingResult<T> {
 
   /// The handlers at this sub-path.
   List<T> get handlers {
-    return <T>[]
-      ..addAll(shallowRouter!.middleware)
-      ..addAll(shallowRoute!.handlers!);
+    return <T>[...shallowRouter!.middleware, ...shallowRoute!.handlers!];
   }
 
   /// All handlers on this sub-path and its children.
@@ -69,7 +67,7 @@ class RoutingResult<T> {
 
   /// All parameters on this sub-path and its children.
   Map<String?, dynamic> get allParams {
-    final Map<String?, dynamic> params = {};
+    final params = <String?, dynamic>{};
 
     void crawl(RoutingResult result) {
       params.addAll(result.params);
@@ -92,6 +90,6 @@ class RoutingResult<T> {
       this.shallowRoute,
       this.shallowRouter,
       required this.tail}) {
-    this.params.addAll(params ?? {});
+    this.params.addAll(params);
   }
 }