diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 045712fb1..e6ccb4cd8 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -509,9 +509,6 @@
     <InvalidDocblock>
       <code><![CDATA[final class ActivityInstantiator extends Instantiator]]></code>
     </InvalidDocblock>
-    <PossiblyNullArgument>
-      <code><![CDATA[$this->getInstance($prototype)]]></code>
-    </PossiblyNullArgument>
   </file>
   <file src="src/Internal/Declaration/Instantiator/Instantiator.php">
     <MissingTemplateParam>
@@ -527,12 +524,6 @@
     <InvalidDocblock>
       <code><![CDATA[final class WorkflowInstantiator extends Instantiator]]></code>
     </InvalidDocblock>
-    <PossiblyNullArgument>
-      <code><![CDATA[$this->getInstance($prototype)]]></code>
-    </PossiblyNullArgument>
-    <RedundantCondition>
-      <code><![CDATA[$class !== null]]></code>
-    </RedundantCondition>
   </file>
   <file src="src/Internal/Declaration/Prototype/Prototype.php">
     <InvalidReturnStatement>
@@ -595,12 +586,10 @@
     </InvalidPropertyAssignmentValue>
     <MissingClosureReturnType>
       <code><![CDATA[function (QueryInput $input) use ($fn) {]]></code>
-      <code><![CDATA[function (UpdateInput $input) use ($fn) {]]></code>
     </MissingClosureReturnType>
     <MoreSpecificImplementedParamType>
       <code><![CDATA[$handler]]></code>
       <code><![CDATA[$handler]]></code>
-      <code><![CDATA[$name]]></code>
     </MoreSpecificImplementedParamType>
     <PropertyNotSetInConstructor>
       <code><![CDATA[$queryExecutor]]></code>
@@ -615,7 +604,6 @@
   <file src="src/Internal/Declaration/WorkflowInstance/SignalQueue.php">
     <ArgumentTypeCoercion>
       <code><![CDATA[$signal]]></code>
-      <code><![CDATA[$signal]]></code>
     </ArgumentTypeCoercion>
     <MissingConstructor>
       <code><![CDATA[$onSignal]]></code>
@@ -752,13 +740,9 @@
     </PossiblyFalseArgument>
   </file>
   <file src="src/Internal/Marshaller/Type/ArrayType.php">
-    <DocblockTypeContradiction>
-      <code><![CDATA[\is_array($value)]]></code>
-    </DocblockTypeContradiction>
     <MoreSpecificImplementedParamType>
       <code><![CDATA[$current]]></code>
       <code><![CDATA[$value]]></code>
-      <code><![CDATA[$value]]></code>
     </MoreSpecificImplementedParamType>
   </file>
   <file src="src/Internal/Marshaller/Type/DateIntervalType.php">
@@ -1144,10 +1128,6 @@
       <code><![CDATA[findValidateUpdateHandler]]></code>
       <code><![CDATA[getUpdateHandlerNames]]></code>
     </UndefinedInterfaceMethod>
-    <UnusedVariable>
-      <code><![CDATA[$resolver]]></code>
-      <code><![CDATA[$resolver]]></code>
-    </UnusedVariable>
   </file>
   <file src="src/Internal/Transport/Router/StartWorkflow.php">
     <MissingClosureReturnType>
diff --git a/src/Internal/Declaration/Dispatcher/Dispatcher.php b/src/Internal/Declaration/Dispatcher/Dispatcher.php
index 353049c73..2db1af613 100644
--- a/src/Internal/Declaration/Dispatcher/Dispatcher.php
+++ b/src/Internal/Declaration/Dispatcher/Dispatcher.php
@@ -131,15 +131,11 @@ private function createExecutorFromMethod(\ReflectionMethod $fun): \Closure
      * @psalm-return FunctionExecutor
      *
      * @param \ReflectionFunction $fun
-     * @return \Closure
+     * @return \Closure(object, array): mixed
      */
     private function createExecutorFromFunction(\ReflectionFunction $fun): \Closure
     {
-        return static function (?object $ctx, array $arguments) use ($fun) {
-            if ($ctx === null) {
-                return $fun->invoke(...$arguments);
-            }
-
+        return static function (object $ctx, array $arguments) use ($fun) {
             $closure = $fun->getClosure();
 
             try {
diff --git a/src/Internal/Marshaller/Type/ArrayType.php b/src/Internal/Marshaller/Type/ArrayType.php
index 6128451a1..271331a4b 100644
--- a/src/Internal/Marshaller/Type/ArrayType.php
+++ b/src/Internal/Marshaller/Type/ArrayType.php
@@ -70,6 +70,7 @@ public static function makeRule(\ReflectionProperty $property): ?MarshallingRule
 
     /**
      * @psalm-assert array $value
+     * @param mixed $value
      * @param array $current
      */
     public function parse($value, $current): array