diff --git a/src/modules/Gdbm/gdbmmod.c b/src/modules/Gdbm/gdbmmod.c
index 1af43a1b9ef41115faff287d910fa7d2d899ba72..490286136b65fd866adad169ae7a223b5f95ca05 100644
--- a/src/modules/Gdbm/gdbmmod.c
+++ b/src/modules/Gdbm/gdbmmod.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: gdbmmod.c,v 1.7 1999/02/10 21:47:17 hubbe Exp $");
+RCSID("$Id: gdbmmod.c,v 1.8 1999/06/19 20:20:38 hubbe Exp $");
 #include "gdbm_machine.h"
 #include "threads.h"
 
@@ -340,7 +340,7 @@ void pike_module_init(void)
   ADD_FUNCTION("create",gdbmmod_create,tFunc(tOr(tVoid,tStr) tOr(tVoid,tStr),tVoid),0);
 
   /* function(:void) */
-  ADD_FUNCTION("close",gdbmmod_close,tFunc(,tVoid),0);
+  ADD_FUNCTION("close",gdbmmod_close,tFunc(tNone,tVoid),0);
   /* function(string,string:int) */
   ADD_FUNCTION("store",gdbmmod_store,tFunc(tStr tStr,tInt),0);
   /* function(string,string:int) */
@@ -352,13 +352,13 @@ void pike_module_init(void)
   /* function(string:int) */
   ADD_FUNCTION("delete",gdbmmod_delete,tFunc(tStr,tInt),0);
   /* function(:string) */
-  ADD_FUNCTION("firstkey",gdbmmod_firstkey,tFunc(,tStr),0);
+  ADD_FUNCTION("firstkey",gdbmmod_firstkey,tFunc(tNone,tStr),0);
   /* function(string:string) */
   ADD_FUNCTION("nextkey",gdbmmod_nextkey,tFunc(tStr,tStr),0);
   /* function(:int) */
-  ADD_FUNCTION("reorganize",gdbmmod_reorganize,tFunc(,tInt),0);
+  ADD_FUNCTION("reorganize",gdbmmod_reorganize,tFunc(tNone,tInt),0);
   /* function(:void) */
-  ADD_FUNCTION("sync",gdbmmod_sync,tFunc(,tVoid),0);
+  ADD_FUNCTION("sync",gdbmmod_sync,tFunc(tNone,tVoid),0);
 
   set_init_callback(init_gdbm_glue);
   set_exit_callback(exit_gdbm_glue);
diff --git a/src/modules/Gmp/mpz_glue.c b/src/modules/Gmp/mpz_glue.c
index 0f90b4d6fa4e29768cd1911bfe54fd39fc165411..c776ba26de8e4289f30227843d8b016016342fdc 100644
--- a/src/modules/Gmp/mpz_glue.c
+++ b/src/modules/Gmp/mpz_glue.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: mpz_glue.c,v 1.41 1999/03/03 05:30:07 hubbe Exp $");
+RCSID("$Id: mpz_glue.c,v 1.42 1999/06/19 20:20:47 hubbe Exp $");
 #include "gmp_machine.h"
 
 #if defined(HAVE_GMP2_GMP_H) && defined(HAVE_LIBGMP2)
@@ -966,7 +966,7 @@ void pike_module_init(void)
   add_function("`|",mpzmod_or,MPZ_BINOP_TYPE,0);
   add_function("``|",mpzmod_or,MPZ_BINOP_TYPE,0);
   /* function(:object) */
-  ADD_FUNCTION("`~",mpzmod_compl,tFunc(,tObj),0);
+  ADD_FUNCTION("`~",mpzmod_compl,tFunc(tNone,tObj),0);
 
 #define MPZ_SHIFT_TYPE "function(int|float|object:object)"
   add_function("`<<",mpzmod_lsh,MPZ_SHIFT_TYPE,0);
@@ -985,10 +985,10 @@ void pike_module_init(void)
   add_function("`!=",mpzmod_nq,MPZ_CMPOP_TYPE,0);
 
   /* function(:int) */
-  ADD_FUNCTION("`!",mpzmod_not,tFunc(,tInt),0);
+  ADD_FUNCTION("`!",mpzmod_not,tFunc(tNone,tInt),0);
 
   /* function(:int) */
-  ADD_FUNCTION("__hash",mpzmod_get_int,tFunc(,tInt),0);
+  ADD_FUNCTION("__hash",mpzmod_get_int,tFunc(tNone,tInt),0);
   /* function(string:mixed) */
   ADD_FUNCTION("cast",mpzmod_cast,tFunc(tStr,tMix),0);
 
@@ -998,14 +998,14 @@ void pike_module_init(void)
   ADD_FUNCTION("size", mpzmod_size,tFunc(tOr(tVoid,tInt),tInt), 0);
 
   /* function(:int) */
-  ADD_FUNCTION("cast_to_int",mpzmod_get_int,tFunc(,tInt),0);
+  ADD_FUNCTION("cast_to_int",mpzmod_get_int,tFunc(tNone,tInt),0);
   /* function(:string) */
-  ADD_FUNCTION("cast_to_string",mpzmod_get_string,tFunc(,tStr),0);
+  ADD_FUNCTION("cast_to_string",mpzmod_get_string,tFunc(tNone,tStr),0);
   /* function(:float) */
-  ADD_FUNCTION("cast_to_float",mpzmod_get_float,tFunc(,tFlt),0);
+  ADD_FUNCTION("cast_to_float",mpzmod_get_float,tFunc(tNone,tFlt),0);
 
   /* function(:int) */
-  ADD_FUNCTION("probably_prime_p",mpzmod_probably_prime_p,tFunc(,tInt),0);
+  ADD_FUNCTION("probably_prime_p",mpzmod_probably_prime_p,tFunc(tNone,tInt),0);
   /* function(int|void:int) */
   ADD_FUNCTION("small_factor", mpzmod_small_factor,tFunc(tOr(tInt,tVoid),tInt), 0);
   /* function(int|void,int|void:object) */
@@ -1020,9 +1020,9 @@ void pike_module_init(void)
   "function(" MPZ_ARG_TYPE ":object)", 0);
 
   /* function(:object) */
-  ADD_FUNCTION("sqrt", mpzmod_sqrt,tFunc(,tObj),0);
+  ADD_FUNCTION("sqrt", mpzmod_sqrt,tFunc(tNone,tObj),0);
   /* function(:array(object)) */
-  ADD_FUNCTION("sqrtrem", mpzmod_sqrtrem,tFunc(,tArr(tObj)), 0);
+  ADD_FUNCTION("sqrtrem", mpzmod_sqrtrem,tFunc(tNone,tArr(tObj)), 0);
   add_function("powm",mpzmod_powm,
   "function(" MPZ_ARG_TYPE "," MPZ_ARG_TYPE ":object)", 0);
   /* function(int:object) */
@@ -1034,7 +1034,7 @@ void pike_module_init(void)
 #if 0
   /* These are not implemented yet */
   /* function(:int) */
-  ADD_FUNCTION("squarep", mpzmod_squarep,tFunc(,tInt), 0);
+  ADD_FUNCTION("squarep", mpzmod_squarep,tFunc(tNone,tInt), 0);
   add_function("divmod", mpzmod_divmod, "function(" MPZ_ARG_TYPE ":array(object))", 0);
   add_function("divm", mpzmod_divm, "function(" MPZ_ARG_TYPE ","
 	       MPZ_ARG_TYPE ":object)", 0);
diff --git a/src/operators.c b/src/operators.c
index b600e342148d447cce8a7431aab82bbb23e178e6..5b02bf4e498d52c59d13f0e9710071fb77679e57 100644
--- a/src/operators.c
+++ b/src/operators.c
@@ -6,7 +6,7 @@
 /**/
 #include "global.h"
 #include <math.h>
-RCSID("$Id: operators.c,v 1.54 1999/05/25 21:21:31 mirar Exp $");
+RCSID("$Id: operators.c,v 1.55 1999/06/19 20:14:51 hubbe Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "multiset.h"
@@ -2022,9 +2022,9 @@ void init_operators(void)
   ADD_EFUN2("`->",f_arrow,tOr(tFunc(tArr(tOr4(tObj,tMapping,tMultiset,tArray)) tStr,tArr(tMix)),tFunc(tOr4(tObj,tMapping,tMultiset,tPrg) tStr,tMix)),OPT_TRY_OPTIMIZE,0,0);
 
   /* function(mixed...:int) */
-  ADD_EFUN2("`==",f_eq,tFuncV(,tMix,tInt),OPT_TRY_OPTIMIZE,optimize_eq,generate_comparison);
+  ADD_EFUN2("`==",f_eq,tFuncV(tNone,tMix,tInt),OPT_TRY_OPTIMIZE,optimize_eq,generate_comparison);
   /* function(mixed...:int) */
-  ADD_EFUN2("`!=",f_ne,tFuncV(,tMix,tInt),OPT_TRY_OPTIMIZE,0,generate_comparison);
+  ADD_EFUN2("`!=",f_ne,tFuncV(tNone,tMix,tInt),OPT_TRY_OPTIMIZE,0,generate_comparison);
   /* function(mixed:int) */
   add_efun2("`!",f_not,"function(mixed:int(0..1))",OPT_TRY_OPTIMIZE,optimize_not,generate_not);
 
@@ -2035,7 +2035,7 @@ void init_operators(void)
   add_efun2("`>=",f_ge,CMP_TYPE,OPT_TRY_OPTIMIZE,0,generate_comparison);
 
   ADD_EFUN2("`+",f_add,
-	    tOr7(tIfnot(tFuncV(,tNot(tObj),tMix),tFunction),
+	    tOr7(tIfnot(tFuncV(tNone,tNot(tObj),tMix),tFunction),
 		 tFuncV(tInt,tInt,tInt),
 		 tIfnot(tFuncV(tInt,tInt,tMix),
 			tFuncV(tOr(tInt,tFlt),tOr(tInt,tFlt),tFlt)),
@@ -2051,7 +2051,7 @@ void init_operators(void)
 	    OPT_TRY_OPTIMIZE,optimize_binary,generate_sum);
   
   ADD_EFUN2("`-",f_minus,
-	    tOr7(tIfnot(tFuncV(,tNot(tObj),tMix),tFunction),
+	    tOr7(tIfnot(tFuncV(tNone,tNot(tObj),tMix),tFunction),
 		 tFuncV(tInt,tInt,tInt),
 		 tIfnot(tFuncV(tInt,tInt,tMix),
 			tFuncV(tOr(tInt,tFlt),tOr(tInt,tFlt),tFlt)),
@@ -2083,7 +2083,7 @@ void init_operators(void)
 	    "function(array(0=mixed),int:array(0))|"
 	    "function(string,int:string) */
   ADD_EFUN2("`*",f_multiply,
-	    tOr7(tIfnot(tFuncV(,tNot(tObj),tMix),tFunction),
+	    tOr7(tIfnot(tFuncV(tNone,tNot(tObj),tMix),tFunction),
 		 tFunc(tArr(tArr(tSetvar(1,tMix))) 
 		       tArr(tSetvar(1,tMix)),tArr(tVar(1))),
 		 tFuncV(tInt,tInt,tInt),
@@ -2099,7 +2099,7 @@ void init_operators(void)
 	    "!function(int...:mixed)&function(float|int...:float)|"
 	    "function(array(0=mixed),array|int|float...:array(array(0)))|"
 	    "function(string,string|int|float...:array(string)) */
-  ADD_EFUN2("`/",f_divide,tOr5(tIfnot(tFuncV(,tNot(tObj),tMix),tFunction),tFuncV(tInt,tInt,tInt),tIfnot(tFuncV(,tInt,tMix),tFuncV(,tOr(tFlt,tInt),tFlt)),tFuncV(tArr(tSetvar(0,tMix)),tOr3(tArray,tInt,tFlt),tArr(tArr(tVar(0)))),tFuncV(tStr,tOr3(tStr,tInt,tFlt),tArr(tStr))),
+  ADD_EFUN2("`/",f_divide,tOr5(tIfnot(tFuncV(tNone,tNot(tObj),tMix),tFunction),tFuncV(tInt,tInt,tInt),tIfnot(tFuncV(tNone,tInt,tMix),tFuncV(tNone,tOr(tFlt,tInt),tFlt)),tFuncV(tArr(tSetvar(0,tMix)),tOr3(tArray,tInt,tFlt),tArr(tArr(tVar(0)))),tFuncV(tStr,tOr3(tStr,tInt,tFlt),tArr(tStr))),
 	    OPT_TRY_OPTIMIZE,0,generate_divide);
 
   /* function(mixed,object:mixed)|"
diff --git a/src/security.c b/src/security.c
index 626a2236f66d31a0d88f2e2e1acda407454557bf..e11f5aeb24fb2ea6d4f0a169618fc357d6c0bfbc 100644
--- a/src/security.c
+++ b/src/security.c
@@ -222,13 +222,13 @@ void init_pike_security(void)
   /* function(object:void) */
   ADD_FUNCTION("set_default_creds",set_default_creds,tFunc(tObj,tVoid),0);
   /* function(:object) */
-  ADD_FUNCTION("get_default_creds",get_default_creds,tFunc(,tObj),0);
+  ADD_FUNCTION("get_default_creds",get_default_creds,tFunc(tNone,tObj),0);
   /* function(:object) */
-  ADD_FUNCTION("get_user",creds_get_user,tFunc(,tObj),0);
+  ADD_FUNCTION("get_user",creds_get_user,tFunc(tNone,tObj),0);
   /* function(:int) */
-  ADD_FUNCTION("get_allow_bits",creds_get_allow_bits,tFunc(,tInt),0);
+  ADD_FUNCTION("get_allow_bits",creds_get_allow_bits,tFunc(tNone,tInt),0);
   /* function(:int) */
-  ADD_FUNCTION("get_data_bits",creds_get_data_bits,tFunc(,tInt),0);
+  ADD_FUNCTION("get_data_bits",creds_get_data_bits,tFunc(tNone,tInt),0);
   /* function(object,int,int:void) */
   ADD_FUNCTION("create",creds_create,tFunc(tObj tInt tInt,tVoid),0);
   /* function(mixed:void) */
@@ -245,7 +245,7 @@ void init_pike_security(void)
   ADD_EFUN("call_with_creds",f_call_with_creds,tFuncV(tObj,tMix,tMix),OPT_SIDE_EFFECT);
   
 /* function(:object) */
-  ADD_EFUN("get_current_creds",f_get_current_creds,tFunc(,tObj),OPT_EXTERNAL_DEPEND);
+  ADD_EFUN("get_current_creds",f_get_current_creds,tFunc(tNone,tObj),OPT_EXTERNAL_DEPEND);
   
 /* function(mixed:object) */
   ADD_EFUN("get_object_creds",f_get_object_creds,tFunc(tMix,tObj),OPT_EXTERNAL_DEPEND);
diff --git a/src/signal_handler.c b/src/signal_handler.c
index fcf92b167ada4a207109b2550ed46924abfb2779..730379d8715fab102dc01e552d2641f0c0a545aa 100644
--- a/src/signal_handler.c
+++ b/src/signal_handler.c
@@ -25,7 +25,7 @@
 #include "main.h"
 #include <signal.h>
 
-RCSID("$Id: signal_handler.c,v 1.139 1999/06/12 13:53:21 grubba Exp $");
+RCSID("$Id: signal_handler.c,v 1.140 1999/06/19 20:17:43 hubbe Exp $");
 
 #ifdef HAVE_PASSWD_H
 # include <passwd.h>
@@ -3096,11 +3096,11 @@ void init_signals(void)
   /* function(string:int) */
   ADD_FUNCTION("set_priority",f_pid_status_set_priority,tFunc(tStr,tInt),0);
   /* function(:int) */
-  ADD_FUNCTION("wait",f_pid_status_wait,tFunc(,tInt),0);
+  ADD_FUNCTION("wait",f_pid_status_wait,tFunc(tNone,tInt),0);
   /* function(:int) */
-  ADD_FUNCTION("status",f_pid_status_status,tFunc(,tInt),0);
+  ADD_FUNCTION("status",f_pid_status_status,tFunc(tNone,tInt),0);
   /* function(:int) */
-  ADD_FUNCTION("pid",f_pid_status_pid,tFunc(,tInt),0);
+  ADD_FUNCTION("pid",f_pid_status_pid,tFunc(tNone,tInt),0);
 #ifdef HAVE_KILL
   /* function(int:int) */
   ADD_FUNCTION("kill",f_pid_status_kill,tFunc(tInt,tInt), 0);
@@ -3136,7 +3136,7 @@ void init_signals(void)
   ADD_EFUN("signum",f_signum,tFunc(tStr,tInt),0);
   
 /* function(:int) */
-  ADD_EFUN("getpid",f_getpid,tFunc(,tInt),0);
+  ADD_EFUN("getpid",f_getpid,tFunc(tNone,tInt),0);
 #ifdef HAVE_ALARM
   
 /* function(int:int) */
@@ -3148,7 +3148,7 @@ void init_signals(void)
   ADD_EFUN("ualarm",f_ualarm,tFunc(tInt,tInt),OPT_SIDE_EFFECT);
 #endif
 
-  ADD_EFUN("atexit",f_atexit,tFuncV( ,tMix,tVoid),OPT_SIDE_EFFECT);
+  ADD_EFUN("atexit",f_atexit,tFuncV(tNone ,tMix,tVoid),OPT_SIDE_EFFECT);
 }
 
 void exit_signals(void)
diff --git a/src/svalue.h b/src/svalue.h
index 1909c7898766dee9e8da7ce69af72aa9c6db5cef..8d294f8a5ae7bcf98d12400bed745767326d1b49 100644
--- a/src/svalue.h
+++ b/src/svalue.h
@@ -5,7 +5,7 @@
 \*/
 
 /*
- * $Id: svalue.h,v 1.31 1999/06/09 20:51:44 mirar Exp $
+ * $Id: svalue.h,v 1.32 1999/06/19 20:18:10 hubbe Exp $
  */
 #ifndef SVALUE_H
 #define SVALUE_H
@@ -113,8 +113,9 @@ extern char *type_name[];
 #define tMultiset tSet(tMix)
 #define tObj "\003\000\000\000\000\000"
 #define tFuncV(ARGS,REST,RET) "\004" ARGS "\021" REST RET
-#define tFunc(ARGS,RET) tFuncV(ARGS,tVoid,RET)
-#define tFunction tFuncV(,tMix,tMix)
+#define tFunc(ARGS,RET) tFuncV(ARGS "", tVoid, RET)
+#define tFunction tFuncV("" ,tMix,tMix)
+#define tNone ""
 #define tPrg "\005"
 #define tProgram "\005"
 #define tStr "\006"