3 files changed, 14 insertions, 3 deletions
diff --git a/eval.c b/eval.c
index c98625a8..1ff89af2 100644
--- a/eval.c
+++ b/eval.c
@@ -1142,9 +1142,19 @@ val apply_intrinsic(val fun, val args)
   return apply(fun, apply_intrinsic_frob_args(z(args)));
 }
 
-static val applyv(val fun, struct args *args)
+val applyv(val fun, struct args *args)
 {
-  return apply_intrinsic(fun, args_get_list(args));
+  args_normalize_least(args, 1);
+
+  if (!args->fill)
+    uw_throwf(error_s, lit("apply: trailing-args argument missing"), nao);
+
+  if (!args->list)
+    args->list = z(args->arg[--args->fill]);
+  else
+    args->list = apply_intrinsic_frob_args(args->list);
+
+  return generic_funcall(fun, args);
 }
 
 static loc term(loc head)
diff --git a/eval.h b/eval.h
index fa0dc88a..4122d174 100644
--- a/eval.h
+++ b/eval.h
@@ -67,6 +67,7 @@ void reg_mac(val sym, val fun);
 val set_get_symacro(val sym, val form);
 val apply(val fun, val arglist);
 val apply_intrinsic(val fun, val args);
+val applyv(val fun, struct args *args);
 val eval_progn(val forms, val env, val ctx_form);
 val eval(val form, val env, val ctx_form);
 val eval_intrinsic(val form, val env);
diff --git a/vm.c b/vm.c
index 362f1adb..c0370343 100644
--- a/vm.c
+++ b/vm.c
@@ -464,7 +464,7 @@ static void vm_apply(struct vm *vm, vm_word_t insn)
     }
   }
 
-  result = apply_intrinsic(vm_get(vm->dspl, fun), args_get_list(args));
+  result = applyv(vm_get(vm->dspl, fun), args);
   vm_set(vm->dspl, dest, result);
 }