diff --git a/mews_pedantic/lib/analysis_options.yaml b/mews_pedantic/lib/analysis_options.yaml
index a1183db6..9a4661b5 100644
--- a/mews_pedantic/lib/analysis_options.yaml
+++ b/mews_pedantic/lib/analysis_options.yaml
@@ -27,6 +27,8 @@ linter:
     - no_adjacent_strings_in_list
     - no_duplicate_case_values
     - no_logic_in_create_state
+    - no_self_assignments
+    - no_wildcard_variable_uses
     # - prefer-relative-imports
     - prefer_void_to_null
     - test_types_in_equals
@@ -45,6 +47,7 @@ linter:
     # - always_put_required_named_parameters_first
     # - always_specify_types
     - annotate_overrides
+    - annotate_redeclares
     # - avoid_annotating_with_dynamic
     # - avoid_bool_literals_in_conditional_expressions
     - avoid_catches_without_on_clauses
diff --git a/optimus/lib/src/tooltip/tooltip_overlay.dart b/optimus/lib/src/tooltip/tooltip_overlay.dart
index 2e7521dd..d1e6afa9 100644
--- a/optimus/lib/src/tooltip/tooltip_overlay.dart
+++ b/optimus/lib/src/tooltip/tooltip_overlay.dart
@@ -69,13 +69,14 @@ class TooltipOverlayState extends State<TooltipOverlay>
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback(_afterInitialLayoutCallback);
+    WidgetsBinding.instance
+        .addPostFrameCallback((_) => _afterInitialLayoutCallback());
   }
 
   @override
   void didUpdateWidget(TooltipOverlay oldWidget) {
     super.didUpdateWidget(oldWidget);
-    WidgetsBinding.instance.addPostFrameCallback(_updateRect);
+    WidgetsBinding.instance.addPostFrameCallback((_) => _updateRect());
   }
 
   double get _overlayWidth => _overlaySize?.width ?? 0;
@@ -236,12 +237,13 @@ class TooltipOverlayState extends State<TooltipOverlay>
               : end
           : center;
 
-  void _afterInitialLayoutCallback(dynamic _) {
-    _updateRect(_);
-    WidgetsBinding.instance.addPostFrameCallback(_afterFirstLayoutCallback);
+  void _afterInitialLayoutCallback() {
+    _updateRect();
+    WidgetsBinding.instance
+        .addPostFrameCallback((_) => _afterFirstLayoutCallback());
   }
 
-  void _afterFirstLayoutCallback(dynamic _) {
+  void _afterFirstLayoutCallback() {
     if (!mounted) return;
     setState(() {
       _position = _calculatePosition();
@@ -249,7 +251,7 @@ class TooltipOverlayState extends State<TooltipOverlay>
     });
   }
 
-  void _updateRect(dynamic _) {
+  void _updateRect() {
     if (!mounted) return;
     final newRect = _calculateRect(widget.anchorKey);
     final newTooltipRect = _calculateRect(widget.tooltipKey);