diff --git a/package-lock.json b/package-lock.json
index fd5dbc1..7f8d30e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@commitlint/cli": "19.5.0",
         "@commitlint/config-conventional": "19.5.0",
         "@eslint/js": "9.12.0",
-        "@stylistic/eslint-plugin": "2.8.0",
+        "@stylistic/eslint-plugin": "2.9.0",
         "@types/eslint__js": "8.42.3",
         "@types/node": "20.16.10",
         "@types/semver": "7.5.8",
@@ -1987,15 +1987,15 @@
       }
     },
     "node_modules/@stylistic/eslint-plugin": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-2.8.0.tgz",
-      "integrity": "sha512-Ufvk7hP+bf+pD35R/QfunF793XlSRIC7USr3/EdgduK9j13i2JjmsM0LUz3/foS+jDYp2fzyWZA9N44CPur0Ow==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-2.9.0.tgz",
+      "integrity": "sha512-OrDyFAYjBT61122MIY1a3SfEgy3YCMgt2vL4eoPmvTwDBwyQhAXurxNQznlRD/jESNfYWfID8Ej+31LljvF7Xg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/utils": "^8.4.0",
-        "eslint-visitor-keys": "^4.0.0",
-        "espree": "^10.1.0",
+        "@typescript-eslint/utils": "^8.8.0",
+        "eslint-visitor-keys": "^4.1.0",
+        "espree": "^10.2.0",
         "estraverse": "^5.3.0",
         "picomatch": "^4.0.2"
       },
diff --git a/package.json b/package.json
index c8e818e..6d669cc 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "@commitlint/cli": "19.5.0",
     "@commitlint/config-conventional": "19.5.0",
     "@eslint/js": "9.12.0",
-    "@stylistic/eslint-plugin": "2.8.0",
+    "@stylistic/eslint-plugin": "2.9.0",
     "@types/eslint__js": "8.42.3",
     "@types/node": "20.16.10",
     "@types/semver": "7.5.8",
diff --git a/src/create-actor.ts b/src/create-actor.ts
index a6a83d5..801ac52 100644
--- a/src/create-actor.ts
+++ b/src/create-actor.ts
@@ -23,11 +23,11 @@ export type CreateActorOptions<TLogic extends xs.AnyActorLogic> =
 export type CurryCreateActorFromLogic = (() => CurryCreateActorFromLogic) &
   (<TLogic extends xs.AnyActorLogic>(
     logic: TLogic,
-  ) => CurryCreateActorFromLogicP1<TLogic>) &
+    options: CreateActorOptions<TLogic>,
+  ) => xs.Actor<TLogic>) &
   (<TLogic extends xs.AnyActorLogic>(
     logic: TLogic,
-    options: CreateActorOptions<TLogic>,
-  ) => xs.Actor<TLogic>);
+  ) => CurryCreateActorFromLogicP1<TLogic>);
 
 export type CurryCreateActorFromLogicP1<TLogic extends xs.AnyActorLogic> =
   (() => CurryCreateActorFromLogicP1<TLogic>) &
@@ -36,11 +36,11 @@ export type CurryCreateActorFromLogicP1<TLogic extends xs.AnyActorLogic> =
 export type CurryCreateActorWith = (() => CurryCreateActorWith) &
   (<TLogic extends xs.AnyActorLogic>(
     options: CreateActorOptions<TLogic>,
-  ) => CurryCreateActorWithP1<TLogic>) &
+    logic: TLogic,
+  ) => xs.Actor<TLogic>) &
   (<TLogic extends xs.AnyActorLogic>(
     options: CreateActorOptions<TLogic>,
-    logic: TLogic,
-  ) => xs.Actor<TLogic>);
+  ) => CurryCreateActorWithP1<TLogic>);
 
 export type CurryCreateActorWithP1<TLogic extends xs.AnyActorLogic> =
   (() => CurryCreateActorWithP1<TLogic>) &
diff --git a/src/until-done.ts b/src/until-done.ts
index 6b233ed..da7feea 100644
--- a/src/until-done.ts
+++ b/src/until-done.ts
@@ -25,11 +25,11 @@ export type CurryDoneWith =
   | (() => CurryDoneWith)
   | (<Actor extends AnyTerminalActor, Output extends xs.OutputFrom<Actor>>(
       actor: Actor,
-    ) => CurryDoneWithP1<Actor, Output>)
+      options: AuditionOptions,
+    ) => CurryDoneWithP2<Actor, Output>)
   | (<Actor extends AnyTerminalActor, Output extends xs.OutputFrom<Actor>>(
       actor: Actor,
-      options: AuditionOptions,
-    ) => CurryDoneWithP2<Actor, Output>);
+    ) => CurryDoneWithP1<Actor, Output>);
 
 export type CurryDoneWithP1<
   Actor extends AnyTerminalActor,
diff --git a/src/until-emitted.ts b/src/until-emitted.ts
index 5d0e445..81d645d 100644
--- a/src/until-emitted.ts
+++ b/src/until-emitted.ts
@@ -59,11 +59,11 @@ export type CurryEmittedWith = (() => CurryEmittedWith) &
   ) => Promise<ActorEmittedTuple<TActor, TEmittedTypes>>) &
   (<TActor extends AnyStateMachineActor>(
     actor: TActor,
-  ) => CurryEmittedWithP1<TActor>) &
+    options: AuditionOptions,
+  ) => CurryEmittedWithP2<TActor>) &
   (<TActor extends AnyStateMachineActor>(
     actor: TActor,
-    options: AuditionOptions,
-  ) => CurryEmittedWithP2<TActor>);
+  ) => CurryEmittedWithP1<TActor>);
 
 export type CurryEmittedWithP1<TActor extends AnyStateMachineActor> =
   (() => CurryEmittedWithP1<TActor>) &
diff --git a/src/until-event-received.ts b/src/until-event-received.ts
index b46c4ac..c52da51 100644
--- a/src/until-event-received.ts
+++ b/src/until-event-received.ts
@@ -50,11 +50,11 @@ export type CurryEventReceivedWith = (() => CurryEventReceivedWith) &
   ) => CurryEventReceivedWithP3<TActor, TEventTypes>) &
   (<TActor extends AnyEventReceiverActor>(
     actor: TActor,
-  ) => CurryEventReceivedWithP1<TActor>) &
+    options: AuditionEventOptions,
+  ) => CurryEventReceivedWithP2<TActor>) &
   (<TActor extends AnyEventReceiverActor>(
     actor: TActor,
-    options: AuditionEventOptions,
-  ) => CurryEventReceivedWithP2<TActor>);
+  ) => CurryEventReceivedWithP1<TActor>);
 
 export type CurryEventReceivedWithP1<TActor extends AnyEventReceiverActor> =
   (() => CurryEventReceivedWithP1<TActor>) &
diff --git a/src/until-event-sent.ts b/src/until-event-sent.ts
index c4ae813..9949270 100644
--- a/src/until-event-sent.ts
+++ b/src/until-event-sent.ts
@@ -17,7 +17,6 @@ import {
 import {head, isActorRef} from './util.js';
 
 export type CurryEventSent = (() => CurryEventSent) &
-  (<Actor extends AnyActor>(actor: Actor) => CurryEventSentP1<Actor>) &
   (<
     TActor extends AnyActor,
     TReceiver extends AnyEventReceiverActor = AnyEventReceiverActor,
@@ -26,7 +25,8 @@ export type CurryEventSent = (() => CurryEventSent) &
   >(
     actor: TActor,
     eventTypes: TEventTypes,
-  ) => CurryEventSentP2<TReceiver, TEventTypes>);
+  ) => CurryEventSentP2<TReceiver, TEventTypes>) &
+  (<Actor extends AnyActor>(actor: Actor) => CurryEventSentP1<Actor>);
 
 export type CurryEventSentP1<
   TActor extends AnyActor,
@@ -49,20 +49,20 @@ export type CurryEventSentWith = (() => CurryEventSentWith) &
   (<
     TActor extends AnyActor,
     TReceiver extends AnyEventReceiverActor = AnyEventReceiverActor,
+    const TEventTypes extends
+      ActorEventTypeTuple<TReceiver> = ActorEventTypeTuple<TReceiver>,
   >(
     actor: TActor,
     options: AuditionEventOptions,
-  ) => CurryEventSentWithP2<TActor, TReceiver>) &
+    eventTypes: TEventTypes,
+  ) => CurryEventSentWithP3<TReceiver, TEventTypes>) &
   (<
     TActor extends AnyActor,
     TReceiver extends AnyEventReceiverActor = AnyEventReceiverActor,
-    const TEventTypes extends
-      ActorEventTypeTuple<TReceiver> = ActorEventTypeTuple<TReceiver>,
   >(
     actor: TActor,
     options: AuditionEventOptions,
-    eventTypes: TEventTypes,
-  ) => CurryEventSentWithP3<TReceiver, TEventTypes>) &
+  ) => CurryEventSentWithP2<TActor, TReceiver>) &
   (<TActor extends AnyActor>(actor: TActor) => CurryEventSentWithP1<TActor>);
 
 export type CurryEventSentWithP1<TActor extends AnyActor> =
diff --git a/src/until-snapshot.ts b/src/until-snapshot.ts
index b842b77..5d65db8 100644
--- a/src/until-snapshot.ts
+++ b/src/until-snapshot.ts
@@ -12,17 +12,16 @@ import {
 export type CurrySnapshot = (() => CurrySnapshot) &
   (<TActor extends AnySnapshotEmitterActor>(
     actor: TActor,
-  ) => CurrySnapshotP1<TActor>) &
+    predicate: SnapshotPredicate<TActor['logic']>,
+  ) => CurrySnapshotP2<TActor>) &
   (<TActor extends AnySnapshotEmitterActor>(
     actor: TActor,
-    predicate: SnapshotPredicate<TActor['logic']>,
-  ) => CurrySnapshotP2<TActor>);
+  ) => CurrySnapshotP1<TActor>);
 
-export type CurrySnapshotP1<TActor extends AnySnapshotEmitterActor> =
-  (() => CurrySnapshotP1<TActor>) &
-    ((
-      predicate: SnapshotPredicate<TActor['logic']>,
-    ) => CurrySnapshotP2<TActor>);
+export type CurrySnapshotP1<TActor extends AnySnapshotEmitterActor> = ((
+  predicate: SnapshotPredicate<TActor['logic']>,
+) => CurrySnapshotP2<TActor>) &
+  (() => CurrySnapshotP1<TActor>);
 
 export type CurrySnapshotP2<TActor extends AnySnapshotEmitterActor> = Promise<
   xs.SnapshotFrom<TActor['logic']>
@@ -31,26 +30,26 @@ export type CurrySnapshotP2<TActor extends AnySnapshotEmitterActor> = Promise<
 export type CurrySnapshotWith = (() => CurrySnapshotWith) &
   (<TActor extends AnySnapshotEmitterActor>(
     actor: TActor,
-  ) => CurrySnapshotWithP1<TActor>) &
+    predicate: SnapshotPredicate<TActor['logic']>,
+    options: AuditionOptions,
+  ) => CurrySnapshotWithP3<TActor>) &
   (<TActor extends AnySnapshotEmitterActor>(
     actor: TActor,
     predicate: SnapshotPredicate<TActor['logic']>,
   ) => CurrySnapshotWithP2<TActor>) &
   (<TActor extends AnySnapshotEmitterActor>(
     actor: TActor,
-    predicate: SnapshotPredicate<TActor['logic']>,
-    options: AuditionOptions,
-  ) => CurrySnapshotWithP3<TActor>);
+  ) => CurrySnapshotWithP1<TActor>);
 
 // prettier-ignore
-export type CurrySnapshotWithP1<TActor extends AnySnapshotEmitterActor> = (() => CurrySnapshotWithP1<TActor>) &
-  ((
+export type CurrySnapshotWithP1<TActor extends AnySnapshotEmitterActor> = ((
     predicate: SnapshotPredicate<TActor['logic']>,
   ) => CurrySnapshotWithP2<TActor>) &
   ((
   predicate: SnapshotPredicate<TActor['logic']>,
   options: AuditionOptions,
-) => CurrySnapshotWithP3<TActor>);
+) => CurrySnapshotWithP3<TActor>) &
+  (() => CurrySnapshotWithP1<TActor>);
 
 export type CurrySnapshotWithP2<TActor extends AnySnapshotEmitterActor> =
   (() => CurrySnapshotWithP2<TActor>) &
diff --git a/src/until-spawn.ts b/src/until-spawn.ts
index bc2953d..6e9f996 100644
--- a/src/until-spawn.ts
+++ b/src/until-spawn.ts
@@ -16,11 +16,11 @@ export type SpawnTarget = RegExp | string;
 export type CurrySpawn = (() => CurrySpawn) &
   (<TLogic extends xs.AnyActorLogic>(
     actor: AnyStateMachineActor,
-  ) => CurrySpawnP1<TLogic>) &
+    target: SpawnTarget,
+  ) => CurrySpawnP2<TLogic>) &
   (<TLogic extends xs.AnyActorLogic>(
     actor: AnyStateMachineActor,
-    target: SpawnTarget,
-  ) => CurrySpawnP2<TLogic>);
+  ) => CurrySpawnP1<TLogic>);
 
 export type CurrySpawnP1<TLogic extends xs.AnyActorLogic> =
   (() => CurrySpawnP1<TLogic>) &
@@ -33,24 +33,23 @@ export type CurrySpawnP2<TLogic extends xs.AnyActorLogic> = Promise<
 export type CurrySpawnWith = (() => CurrySpawnWith) &
   (<TLogic extends xs.AnyActorLogic>(
     actor: AnyStateMachineActor,
-  ) => CurrySpawnWithP1<TLogic>) &
+    options: AuditionOptions,
+    target: SpawnTarget,
+  ) => CurrySpawnWithP3<TLogic>) &
   (<TLogic extends xs.AnyActorLogic>(
     actor: AnyStateMachineActor,
     options: AuditionOptions,
   ) => CurrySpawnWithP2<TLogic>) &
   (<TLogic extends xs.AnyActorLogic>(
     actor: AnyStateMachineActor,
-    options: AuditionOptions,
-    target: SpawnTarget,
-  ) => CurrySpawnWithP3<TLogic>);
+  ) => CurrySpawnWithP1<TLogic>);
 
-export type CurrySpawnWithP1<TLogic extends xs.AnyActorLogic> =
+export type CurrySpawnWithP1<TLogic extends xs.AnyActorLogic> = ((
+  options: AuditionOptions,
+  target: SpawnTarget,
+) => CurrySpawnWithP3<TLogic>) &
   (() => CurrySpawnWithP1<TLogic>) &
-    ((options: AuditionOptions) => CurrySpawnWithP2<TLogic>) &
-    ((
-      options: AuditionOptions,
-      target: SpawnTarget,
-    ) => CurrySpawnWithP3<TLogic>);
+  ((options: AuditionOptions) => CurrySpawnWithP2<TLogic>);
 
 export type CurrySpawnWithP2<TLogic extends xs.AnyActorLogic> =
   (() => CurrySpawnWithP2<TLogic>) &
diff --git a/src/until-transition.ts b/src/until-transition.ts
index 359e48a..e1a3ae4 100644
--- a/src/until-transition.ts
+++ b/src/until-transition.ts
@@ -22,16 +22,16 @@ import {
 export type CurryTransition = (() => CurryTransition) &
   (<TActor extends AnyStateMachineActor>(
     actor: TActor,
-  ) => CurryTransitionP1<TActor>) &
+    source: string,
+    target: string,
+  ) => CurryTransitionP3) &
   (<TActor extends AnyStateMachineActor>(
     actor: TActor,
     source: string,
   ) => CurryTransitionP2<TActor>) &
   (<TActor extends AnyStateMachineActor>(
     actor: TActor,
-    source: string,
-    target: string,
-  ) => CurryTransitionP3);
+  ) => CurryTransitionP1<TActor>);
 
 export type CurryTransitionP1<TActor extends AnyStateMachineActor> =
   (() => CurryTransitionP1<TActor>) &
@@ -58,13 +58,12 @@ export type CurryTransitionP2<TActor extends AnyStateMachineActor> =
 export type CurryTransitionP3 = Promise<void>;
 
 export type CurryTransitionWith = (() => CurryTransitionWith) &
-  (<TActor extends AnyStateMachineActor>(
-    actor: TActor,
-  ) => CurryTransitionWithP1<TActor>) &
   (<TActor extends AnyStateMachineActor>(
     actor: TActor,
     options: AuditionOptions,
-  ) => CurryTransitionWithP2<TActor>) &
+    source: string,
+    target: string,
+  ) => CurryTransitionWithP4) &
   (<TActor extends AnyStateMachineActor>(
     actor: TActor,
     options: AuditionOptions,
@@ -73,31 +72,32 @@ export type CurryTransitionWith = (() => CurryTransitionWith) &
   (<TActor extends AnyStateMachineActor>(
     actor: TActor,
     options: AuditionOptions,
-    source: string,
-    target: string,
-  ) => CurryTransitionWithP4);
+  ) => CurryTransitionWithP2<TActor>) &
+  (<TActor extends AnyStateMachineActor>(
+    actor: TActor,
+  ) => CurryTransitionWithP1<TActor>);
 
 // conflict with eslint-plugin-perfectionist
 // prettier-ignore
 export type CurryTransitionWithP1<TActor extends AnyStateMachineActor> =
-  & (() => CurryTransitionWithP1<TActor>)
-  & ((options: AuditionOptions) => CurryTransitionWithP2<TActor>)
-  & ((options: AuditionOptions, source: string) => CurryTransitionWithP3<TActor>)
   & ((
       options: AuditionOptions,
       source: string,
       target: string,
-    ) => CurryTransitionWithP4);
+    ) => CurryTransitionWithP4)
+  & (() => CurryTransitionWithP1<TActor>)
+  & ((options: AuditionOptions) => CurryTransitionWithP2<TActor>)
+  & ((options: AuditionOptions, source: string) => CurryTransitionWithP3<TActor>);
 
 // conflict with eslint-plugin-perfectionist
 // prettier-ignore
 export type CurryTransitionWithP2<TActor extends AnyStateMachineActor> =
-  & (() => CurryTransitionWithP2<TActor>)
-  & ((source: string) => CurryTransitionWithP3<TActor>)
   & ((
       source: string,
       target: string,
-    ) => CurryTransitionWithP4);
+    ) => CurryTransitionWithP4)
+  & (() => CurryTransitionWithP2<TActor>)
+  & ((source: string) => CurryTransitionWithP3<TActor>);
 
 export type CurryTransitionWithP3<TActor extends AnyStateMachineActor> =
   (() => CurryTransitionWithP3<TActor>) &