Build in conditional check for multicall, abcast.

lib/exactor/operations.ex

@@ -570,8 +570,8 @@ defmodule ExActor.Operations do
       server_fun: server_fun(type),
       interface_args: Macro.escape(interface_args(interface_matches, options), unquote: true),
       gen_server_args: Macro.escape(gen_server_args(options, type, payload), unquote: true),
-      guard: Macro.escape(guard(options, :interface), unquote: true)
-      # export_option?: Keyword.get(options, :export, nil)
+      guard: Macro.escape(guard(options, :interface), unquote: true),
+      export_option: Macro.escape(options[:export], unquote: true)
     ] do
       {interface_args, gen_server_args} =
         unless type in [:multicall, :abcast] do
@@ -583,17 +583,22 @@ defmodule ExActor.Operations do
           }
         end
 
-      # Extract the server reference as first argument,
-      # And call `server_pid/1` on it inside the interface implementation.
-      # (But not in the function head)
-      [server_ref | gen_server_args_tail] = gen_server_args
-      server_pid_quote = quote(do: server_pid(unquote(server_ref)))
-      interface_gen_server_args = [server_pid_quote | gen_server_args_tail]
+      interface_gen_server_args =
+        if type in [:multicall, :abcast] || export_option do
+          gen_server_args
+        else
+            # Extract the server reference as first argument,
+            # And call `server_pid/1` on it inside the interface implementation.
+            # (But not in the function head)
+            [server_ref | gen_server_args_tail] = gen_server_args
+            server_pid_quote = quote(do: server_pid(unquote(server_ref)))
+            [server_pid_quote | gen_server_args_tail]
+        end
 
       interface_body =
         quote do
-          GenServer.unquote(server_fun)(unquote_splicing(interface_gen_server_args))
-        end
+        GenServer.unquote(server_fun)(unquote_splicing(interface_gen_server_args))
+      end
 
       cond do
         private == nil && guard == nil ->

lib/exactor/tolerant.ex

@@ -31,7 +31,6 @@ defmodule ExActor.Tolerant do
       import ExActor.Responders
 
       unquote(ExActor.Helper.init_generation_state(opts))
-
     end
   end
 end