Tweak last change.
diff --git a/util.c b/util.c
index 3a3db0a..5a85c0b 100644
--- a/util.c
+++ b/util.c
@@ -1303,11 +1303,6 @@
 #  endif
 # endif
 
-# ifndef arg0_index
-#  define arg0_index 0
-#  define arg1_index 1
-# endif
-
 typedef int arg_setup_state;
 
 # define arg_setup(tcp, state) (0)
@@ -1338,6 +1333,11 @@
 # define restore_arg1(tcp, state, val) set_arg1((tcp), (state), (val))
 #endif
 
+#ifndef arg0_index
+# define arg0_index 0
+# define arg1_index 1
+#endif
+
 int
 setbpt(tcp)
 struct tcb *tcp;