diff --git a/src/io.c b/src/io.c
index d3aac94..9a8b8ac 100644
--- a/src/io.c
+++ b/src/io.c
@@ -340,8 +340,7 @@ Object P_Close_Output_Port (Object port) {
     return General_Close_Port (port);
 }
 
-#define General_With(prim,curr,flags) Object prim (name, thunk)\
-        Object name, thunk; {\
+#define General_With(prim,curr,flags) Object prim (Object name, Object thunk) {\
     Object old, ret;\
     GC_Node2;\
 \
diff --git a/src/terminate.c b/src/terminate.c
index 45055cd..533d52a 100644
--- a/src/terminate.c
+++ b/src/terminate.c
@@ -44,8 +44,7 @@ void Init_Terminate () {
 /* Register an object with the given group and termination function;
  * object can be marked as LEADER.
  */
-void Register_Object (obj, group, term, leader_flag) Object obj; GENERIC group;
-        PFO term; {
+void Register_Object (Object obj, GENERIC group, PFO term, int leader_flag) {
     WEAK_NODE *p;
 
     p = (WEAK_NODE *)Safe_Malloc (sizeof (*p));