diff --git a/GUI/xephem/aavso.c b/GUI/xephem/aavso.c
index b2ba2f5..862c270 100644
--- a/GUI/xephem/aavso.c
+++ b/GUI/xephem/aavso.c
@@ -441,10 +441,7 @@ Widget rc_w;
 /* callback from the Close PB */
 /* ARGSUSED */
 static void
-av_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+av_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (av_w);
 }
@@ -452,10 +449,7 @@ XtPointer call;
 /* callback from the Print PB */
 /* ARGSUSED */
 static void
-av_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+av_print_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (curve_pm)
 	    XPSAsk ("AAVSO", av_print);
@@ -492,10 +486,7 @@ av_print()
  */
 /* ARGSUSED */
 static void
-av_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+av_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "Fetch and display light curves from AAVSO."
@@ -508,10 +499,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-av_list_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+av_list_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmListCallbackStruct *lp = (XmListCallbackStruct *)call;
 	char *str;
@@ -532,10 +520,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-av_go_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+av_go_cb (Widget w, XtPointer client, XtPointer call)
 {
 	fetchAndShow();
 }
@@ -546,10 +531,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-av_name_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+av_name_cb (Widget w, XtPointer client, XtPointer call)
 {
 	String name;
 	char buf[1024];
diff --git a/GUI/xephem/annotmenu.c b/GUI/xephem/annotmenu.c
index 379a4f9..f091fa6 100644
--- a/GUI/xephem/annotmenu.c
+++ b/GUI/xephem/annotmenu.c
@@ -467,10 +467,7 @@ ano_mkgcs()
  */
 /* ARGSUSED */
 static void
-ano_del_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ano_del_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int ai = (long int)client;
 	AnnInfo *ap = &anninfo[ai];
@@ -485,10 +482,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ano_hide_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ano_hide_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int set = XmToggleButtonGetState (w);
 	int ai = (long int)client;
@@ -502,10 +496,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ano_new_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ano_new_cb (Widget w, XtPointer client, XtPointer call)
 {
 	(void) ano_newEntry();
 }
@@ -514,10 +505,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ano_togglehides_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ano_togglehides_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int i;
 
@@ -533,10 +521,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ano_hideall_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ano_hideall_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int i;
 
@@ -553,10 +538,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ano_place_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ano_place_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int ai = (long int)client;
 	AnnInfo *ap = &anninfo[ai];
@@ -569,10 +551,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ano_text_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ano_text_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int ai = (long int)client;
 	AnnInfo *ap = &anninfo[ai];
@@ -587,10 +566,7 @@ XtPointer call;
 /* callback from the main Close button */
 /* ARGSUSED */
 static void
-ano_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ano_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* let popdown do all he work */
 	XtPopdown (anoshell_w);
@@ -601,10 +577,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ano_load_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ano_load_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *fn;
 	get_xmstring (w, XmNlabelString, &fn);
@@ -617,10 +590,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ano_save_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ano_save_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char buf[1024], *fn;
 	char *txt;
@@ -647,10 +617,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ano_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ano_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* TODO erase all ? */
 }
@@ -659,10 +626,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ano_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ano_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "Enter text, click Place, move cursor to position text, click and hold,",
diff --git a/GUI/xephem/calmenu.c b/GUI/xephem/calmenu.c
index 9e5ab90..3129641 100644
--- a/GUI/xephem/calmenu.c
+++ b/GUI/xephem/calmenu.c
@@ -405,10 +405,7 @@ Now *np;
  */
 /* ARGSUSED */
 static void
-today_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+today_cb (Widget w, XtPointer client, XtPointer call)
 {
 	TodayCuts c = (TodayCuts)client;
 	Now *np = mm_get_now();
@@ -453,10 +450,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-date_changed_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+date_changed_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Now *np = mm_get_now();
 	int code = (long int)client;
diff --git a/GUI/xephem/closemenu.c b/GUI/xephem/closemenu.c
index c1a6a28..b1b5161 100644
--- a/GUI/xephem/closemenu.c
+++ b/GUI/xephem/closemenu.c
@@ -434,10 +434,7 @@ c_create_shell ()
 /* called when the general help key is pressed */
 /* ARGSUSED */
 static void
-c_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+c_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "Select desired max separation and viewpoint, then Control->Start to find all",
@@ -452,10 +449,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-c_helpon_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+c_helpon_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hlp_dialog ((char *)client, NULL, 0);
 }
@@ -463,10 +457,7 @@ XtPointer call;
 /* callback from file List control button. */
 /* ARGSUSED */
 static void
-c_flist_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+c_flist_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtManageChild (flist_w);
 }
@@ -474,10 +465,7 @@ XtPointer call;
 /* called when our toplevel shell is popped down */
 /* ARGSUSED */
 static void
-c_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+c_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (XtIsManaged(flist_w))
 	    XtUnmanageChild (flist_w);
@@ -486,10 +474,7 @@ XtPointer call;
 /* called when the Close pushbutton is activated */
 /* ARGSUSED */
 static void
-c_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+c_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* let the popdown do the rest of the work */
 	XtPopdown (cshell_w);
@@ -498,10 +483,7 @@ XtPointer call;
 /* called when a list item is double-clicked */
 /* ARGSUSED */
 static void
-c_actlist_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+c_actlist_cb (Widget w, XtPointer client, XtPointer call)
 {
 	(void) sky_point();
 }
@@ -509,10 +491,7 @@ XtPointer call;
 /* called when the Sky Point pushbutton is activated */
 /* ARGSUSED */
 static void
-c_skypoint_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+c_skypoint_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (sky_point() < 0)
 	    xe_msg (1, "First select a line from the list.");
@@ -521,10 +500,7 @@ XtPointer call;
 /* called when the Perform Search pushbutton is activated */
 /* ARGSUSED */
 static void
-c_go_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+c_go_cb (Widget w, XtPointer client, XtPointer call)
 {
 	do_search();
 }
@@ -1117,10 +1093,7 @@ c_create_flist_w()
 /* called when the Ok button is hit in the file flist prompt */
 /* ARGSUSED */
 static void
-c_flistok_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+c_flistok_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char buf[1024];
 	int icount;
diff --git a/GUI/xephem/coordsmenu.c b/GUI/xephem/coordsmenu.c
index 74723f3..9c17191 100644
--- a/GUI/xephem/coordsmenu.c
+++ b/GUI/xephem/coordsmenu.c
@@ -318,10 +318,7 @@ cc_create()
 
 /* callback to Point sky at current coords */
 static void
-cc_point_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+cc_point_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Now *np = mm_get_now();
 	double e = epoch == EOD ? mjd : epoch;
@@ -370,10 +367,7 @@ int h;
 
 /* callback to load from current Sky View center */
 static void
-cc_getsky_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+cc_getsky_cb (Widget w, XtPointer client, XtPointer call)
 {
 	double fov, alt, az, ra, dec;
 	char buf[32];
@@ -434,10 +428,7 @@ canonAll()
 
 /* called to place an eyepiece at these coords on the sky view */
 static void
-cc_eyep_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+cc_eyep_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Now *np = mm_get_now();
 	double fov, ra, dec, alt, az;
@@ -493,29 +484,20 @@ XtPointer call;
 
 /* called from either the Reformat PB or Enter from any TF */
 static void
-cc_canonFormat_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+cc_canonFormat_cb (Widget w, XtPointer client, XtPointer call)
 {
 	canonAll();
 }
 
 static void
-cc_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+cc_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* let popdown do all the work */
 	XtPopdown (ccshell_w);
 }
 
 static void
-cc_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+cc_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 }
 
@@ -523,10 +505,7 @@ XtPointer call;
  * N.B. do not use call, used by different callbacks.
  */
 static void
-cc_vchg_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+cc_vchg_cb (Widget w, XtPointer client, XtPointer call)
 {
 	cc_newval (w);
 }
@@ -535,10 +514,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-cc_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+cc_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = { "Type in any field and the others are updated",};
 
diff --git a/GUI/xephem/datamenu.c b/GUI/xephem/datamenu.c
index 7f5b148..060aefc 100644
--- a/GUI/xephem/datamenu.c
+++ b/GUI/xephem/datamenu.c
@@ -580,10 +580,7 @@ dm_create_shell()
 /* callback to bring up the Data setup dialog */
 /* ARGSUSED */
 void
-dm_setup_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+dm_setup_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (!selshell_w)
 	    dm_create_shell();
@@ -699,10 +696,7 @@ dm_selname (Widget pb_w, int r, int c)
  */
 static void
 /* ARGSUSED */
-dm_activate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+dm_activate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (dm_selecting) {
 	    char *name;
@@ -714,10 +708,7 @@ XtPointer call;
 /* callback when main dialog is popped down */
 static void
 /* ARGSUSED */
-dm_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+dm_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (selshell_w && XtIsManaged (selshell_w))
 	    XtUnmanageChild (selshell_w);
@@ -732,10 +723,7 @@ XtPointer call;
  */
 static void
 /* ARGSUSED */
-dm_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+dm_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* let popdown do the real work */
 	XtPopdown (datashell_w);
@@ -745,10 +733,7 @@ XtPointer call;
  */
 static void
 /* ARGSUSED */
-dm_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+dm_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "This table displays various information about the planets and objects.",
@@ -1637,10 +1622,7 @@ ds_apply_selections()
  */
 static void
 /* ARGSUSED */
-ds_ctl_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ds_ctl_cb (Widget w, XtPointer client, XtPointer call)
 {
 	DSCtrls id = (DSCtrls) client;
 	int i;
@@ -1711,10 +1693,7 @@ dm_create_flist_w()
 /* called when the Ok button is hit in the file list prompt */
 /* ARGSUSED */
 static void
-dm_flistok_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+dm_flistok_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char buf[1024];
 	char *name;
@@ -1776,10 +1755,7 @@ char *how;
 /* callback from file List control button. */
 /* ARGSUSED */
 static void
-dm_flist_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+dm_flist_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (!flist_w)
 	    dm_create_flist_w();
@@ -1791,10 +1767,7 @@ XtPointer call;
 /* callback from x selection control button. */
 /* ARGSUSED */
 static void
-dm_xsel_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+dm_xsel_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *buf = XtMalloc ((nfavs+3)*(NC*20));	/* plenty big :-) */
 	dm_list_get (buf);
diff --git a/GUI/xephem/dbmenu.c b/GUI/xephem/dbmenu.c
index 3795b2d..a38ce6d 100644
--- a/GUI/xephem/dbmenu.c
+++ b/GUI/xephem/dbmenu.c
@@ -392,10 +392,7 @@ db_create_shell ()
 /* a PB in a file PD has been chosen.
  */
 static void
-db_loadpb_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+db_loadpb_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *fn;
 
@@ -593,10 +590,7 @@ XtPointer data;
  */
 /* ARGSUSED */
 static void
-db_helpon_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+db_helpon_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hlp_dialog ((char *)client, NULL, 0);
 }
@@ -627,10 +621,7 @@ XtPointer data;
  */
 /* ARGSUSED */
 static void
-catdel_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+catdel_cb (Widget w, XtPointer client, XtPointer call)
 {
 	watch_cursor(1);
 	db_catdel ((DBCat *)client);
@@ -643,10 +634,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-cathdr_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+cathdr_cb (Widget w, XtPointer client, XtPointer call)
 {
 	watch_cursor(1);
 	db_showhdr (((DBCat *)client)->name);
diff --git a/GUI/xephem/earthmenu.c b/GUI/xephem/earthmenu.c
index 0557d98..b741aea 100644
--- a/GUI/xephem/earthmenu.c
+++ b/GUI/xephem/earthmenu.c
@@ -1451,10 +1451,7 @@ e_buildfavs()
 /* callback when any of the stat buttons are activated. */
 /* ARGSUSED */
 static void
-e_stat_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_stat_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (e_selecting) {
 	    char *userD;
@@ -1467,10 +1464,7 @@ XtPointer call;
 /* callback when the main form in popped down */
 /* ARGSUSED */
 static void
-e_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown(ectrl_w);
 
@@ -1491,10 +1485,7 @@ XtPointer call;
 /* callback for when the main Close button is activated */
 /* ARGSUSED */
 static void
-e_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* let popdown to the real work */
 	XtPopdown (eshell_w);
@@ -1503,10 +1494,7 @@ XtPointer call;
 /* callback for when the control dialog is closed */
 /* ARGSUSED */
 static void
-e_cclose_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_cclose_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (ectrl_w);
 }
@@ -1514,10 +1502,7 @@ XtPointer call;
 /* callback to bring up web update window */
 /* ARGSUSED */
 static void
-e_webupdate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_webupdate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	wdb_manage();
 }
@@ -1527,10 +1512,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_ontrack_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_ontrack_cb (Widget w, XtPointer client, XtPointer call)
 {
 	EObj *eop = &eobjs[(long int)client];
 
@@ -1562,10 +1544,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_onpick_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_onpick_cb (Widget w, XtPointer client, XtPointer call)
 {
 	EObj *eop;
 
@@ -1582,10 +1561,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_show_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_show_cb (Widget w, XtPointer client, XtPointer call)
 {
 	EObj *eop = &eobjs[(long int)client];
 
@@ -1611,10 +1587,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_wantlbl_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_wantlbl_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* if coming on, show as a courtesy */
 	if (TBISON(w)) {
@@ -1631,10 +1604,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_wantfoot_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_wantfoot_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* if coming on, show as a courtesy */
 	if (TBISON(w)) {
@@ -1651,10 +1621,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_wantorb_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_wantorb_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* if coming on, show as a courtesy */
 	if (TBISON(w)) {
@@ -1668,10 +1635,7 @@ XtPointer call;
 /* callback for when the Movie button is activated. */
 /* ARGSUSED */
 static void
-e_anim_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_anim_cb (Widget w, XtPointer client, XtPointer call)
 {
 	mm_movie (MOVIE_SS);
 }
@@ -1679,10 +1643,7 @@ XtPointer call;
 /* callback to add scene to movie loop */
 /* ARGSUSED */
 static void
-e_mloop_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_mloop_cb (Widget w, XtPointer client, XtPointer call)
 {
 	ml_add (e_pm, e_dt_w);
 }
@@ -1712,10 +1673,7 @@ int whether;	/* whether setting up for plotting or for not plotting */
  */
 /* ARGSUSED */
 static void
-e_mhelp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_mhelp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "This is a simple schematic depiction of the Earth surface at the given time.",
@@ -1729,10 +1687,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_chelp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_chelp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "Controls which objects are displayed and their current stats"
@@ -1746,10 +1701,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_helpon_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_helpon_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hlp_dialog ((char *)client, NULL, 0);
 }
@@ -1758,10 +1710,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_print_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XPSAsk ("Earth", e_print);
 }
@@ -1971,10 +1920,7 @@ int x, y;
  */
 /* ARGSUSED */
 static void
-e_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static unsigned last_wid, last_hei;
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
@@ -2214,10 +2160,7 @@ XtPointer call;
 /* called to open the object control window */
 /* ARGSUSED */
 static void
-e_copen_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_copen_cb (Widget w, XtPointer client, XtPointer call)
 {
 	e_set_buttons(e_selecting);
 	XtPopup (ectrl_w, XtGrabNone);
@@ -2230,10 +2173,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_trail_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_trail_cb (Widget w, XtPointer client, XtPointer call)
 {
 	EObj *eop = &eobjs[(long int)client];
 
@@ -2373,10 +2313,7 @@ e_wantorbtgl_cb (Widget w, XtPointer client, XtPointer call)
  */
 /* ARGSUSED */
 static void
-e_wxreload_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_wxreload_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (e_setupwxpm(1, 1) == 0)
 	    e_all (0);
@@ -2387,10 +2324,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_proj_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_proj_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Proj newproj = (Proj)client;
 
@@ -2559,10 +2493,7 @@ e_set_dasize()
  */
 /* ARGSUSED */
 static void
-e_setmain_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_setmain_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Now *np = mm_get_now();
 	int which = (long int)client;
@@ -2592,10 +2523,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_latlong_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_latlong_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmScaleCallbackStruct *s = (XmScaleCallbackStruct *)call;
 
@@ -2619,10 +2547,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_lat0_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_lat0_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int lg;
 
@@ -2644,10 +2569,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-e_point_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+e_point_cb (Widget w, XtPointer client, XtPointer call)
 {
 	e_setelatlng (pu_info.pu_lt, pu_info.pu_lg);
 	noTrack();
diff --git a/GUI/xephem/favmenu.c b/GUI/xephem/favmenu.c
index 203edca..559834f 100644
--- a/GUI/xephem/favmenu.c
+++ b/GUI/xephem/favmenu.c
@@ -470,10 +470,7 @@ int i;
  */
 /* ARGSUSED */
 static void
-fav_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+fav_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 	    "Collection of favorite objects",
@@ -485,10 +482,7 @@ XtPointer call;
 /* callback from the Close PB */
 /* ARGSUSED */
 static void
-fav_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+fav_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (favshell_w);
 }
@@ -498,10 +492,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-fav_load_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+fav_load_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *fn;
 
@@ -519,10 +510,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-fav_save_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+fav_save_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char buf[1024], *fn;
 	char *txt;
@@ -548,10 +536,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-fav_add_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+fav_add_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char buf[1024];
 	char *txt;
@@ -624,10 +609,7 @@ chg_i()
  */
 /* ARGSUSED */
 static void
-fav_on_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+fav_on_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int wanton = XmToggleButtonGetState (w);
 	int i = (long int)client;
@@ -644,10 +626,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-fav_up_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+fav_up_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int i = (long int)client;
 
@@ -665,10 +644,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-fav_dn_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+fav_dn_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int i = (long int)client;
 
@@ -686,10 +662,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-fav_del_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+fav_del_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* save index */
 	deli = (long int)client;
diff --git a/GUI/xephem/glance.c b/GUI/xephem/glance.c
index bdc09cf..a2af94a 100644
--- a/GUI/xephem/glance.c
+++ b/GUI/xephem/glance.c
@@ -401,10 +401,7 @@ ng_create_popup()
 /* callback from the Print PB */
 /* ARGSUSED */
 static void
-ng_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ng_print_cb (Widget w, XtPointer client, XtPointer call)
 {
         XPSAsk ("Night-at-a-Glance", ng_print);
 }
@@ -412,10 +409,7 @@ XtPointer call;
 /* callback from the One Color TB */
 /* ARGSUSED */
 static void
-ng_1col_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ng_1col_cb (Widget w, XtPointer client, XtPointer call)
 {
         ng_redraw();
 }
@@ -423,10 +417,7 @@ XtPointer call;
 /* callback from the inputCallback*/
 /* ARGSUSED */
 static void
-ng_da_input_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ng_da_input_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 	Now *np = mm_get_now();
@@ -588,10 +579,7 @@ ng_ps_annotate ()
 /* callback from PB in popup to set XEphem time to punow. */
 /* ARGSUSED */
 static void
-ng_settime_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ng_settime_cb (Widget w, XtPointer client, XtPointer call)
 {
 	mm_newcaldate (punow.n_mjd);
 }
@@ -599,10 +587,7 @@ XtPointer call;
 /* callback from ngshell_w being popped down. */
 /* ARGSUSED */
 static void
-ng_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ng_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (ng_pm) {
 	    XFreePixmap (XtD, ng_pm);
@@ -615,10 +600,7 @@ XtPointer call;
 
 /* called from Close button */
 static void
-ng_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ng_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (ngshell_w);
 	/* popping down ngshell_w will do all the real work */
@@ -626,10 +608,7 @@ XtPointer call;
 
 /* called to add graph to movie loop */
 static void
-ng_mloop_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ng_mloop_cb (Widget w, XtPointer client, XtPointer call)
 {
 	ml_add (ng_pm, dt_w);
 }
@@ -638,10 +617,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ng_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ng_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 	    "This is the night at a glance.",
@@ -654,10 +630,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ng_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ng_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 	Display *dsp = XtDisplay(ngda_w);
diff --git a/GUI/xephem/helpmenu.c b/GUI/xephem/helpmenu.c
index 56009db..5eabcba 100644
--- a/GUI/xephem/helpmenu.c
+++ b/GUI/xephem/helpmenu.c
@@ -226,10 +226,7 @@ hlp_create ()
 /* called on Close */
 /* ARGSUSED */
 static void
-hlp_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+hlp_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (hlp_w);
 }
@@ -237,10 +234,7 @@ XtPointer call;
 /* called when any TB changes */
 /* ARGSUSED */
 static void
-hlp_radio_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+hlp_radio_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int set = XmToggleButtonGetState(w);
 	int i;
diff --git a/GUI/xephem/hznmenu.c b/GUI/xephem/hznmenu.c
index 549a8b6..79aabcd 100644
--- a/GUI/xephem/hznmenu.c
+++ b/GUI/xephem/hznmenu.c
@@ -420,10 +420,7 @@ hzn_create()
 /* called from Close */
 /* ARGSUSED */
 static void
-hzn_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+hzn_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (hznshell_w);
 }
@@ -431,10 +428,7 @@ XtPointer call;
 /* called when unmapped for any reason */
 /* ARGSUSED */
 static void
-hzn_unmap_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+hzn_unmap_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hznEditingOff();
 }
@@ -442,10 +436,7 @@ XtPointer call;
 /* called when edit TB changes */
 /* ARGSUSED */
 static void
-hzn_edit_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+hzn_edit_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (XmToggleButtonGetState(w)) {
 	    sv_hznOn();				/* public service feature */
@@ -456,10 +447,7 @@ XtPointer call;
 /* called from Help */
 /* ARGSUSED */
 static void
-hzn_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+hzn_help_cb (Widget w, XtPointer client, XtPointer call)
 {
         static char *msg[] = {"Specify local horizon."};
 
@@ -472,10 +460,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-hzn_save_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+hzn_save_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char buf[1024];
 	char *fn;
@@ -503,10 +488,7 @@ XtPointer call;
 /* Displacement TB callback */
 /* ARGSUSED */
 static void
-hzn_displtb_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+hzn_displtb_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hzn_choose (XmToggleButtonGetState (w));
 }
@@ -514,10 +496,7 @@ XtPointer call;
 /* Displacement TF callback */
 /* ARGSUSED */
 static void
-hzn_displtf_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+hzn_displtf_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hzn_choose (1);
 }
@@ -525,10 +504,7 @@ XtPointer call;
 /* File TB callback */
 /* ARGSUSED */
 static void
-hzn_filetb_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+hzn_filetb_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hzn_choose (!XmToggleButtonGetState (w));
 }
@@ -536,10 +512,7 @@ XtPointer call;
 /* File TF callback */
 /* ARGSUSED */
 static void
-hzn_filetf_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+hzn_filetf_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hzn_choose (0);
 }
@@ -549,10 +522,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-hzn_chsfn_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+hzn_chsfn_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *fn;
 
diff --git a/GUI/xephem/imregmenu.c b/GUI/xephem/imregmenu.c
index b0e9e26..9f9ae9c 100644
--- a/GUI/xephem/imregmenu.c
+++ b/GUI/xephem/imregmenu.c
@@ -292,10 +292,7 @@ ir_create()
 /* called from Close */
 /* ARGSUSED */
 static void
-ir_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ir_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (irshell_w);
 }
@@ -303,10 +300,7 @@ XtPointer call;
 /* called from Help */
 /* ARGSUSED */
 static void
-ir_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ir_help_cb (Widget w, XtPointer client, XtPointer call)
 {
         static char *msg[] = {"Define reference stars then each additional."};
 
diff --git a/GUI/xephem/jupmenu.c b/GUI/xephem/jupmenu.c
index e0afa4a..eb3e3cf 100644
--- a/GUI/xephem/jupmenu.c
+++ b/GUI/xephem/jupmenu.c
@@ -1010,10 +1010,7 @@ int whether;	/* whether setting up for plotting or for not plotting */
 /* callback when the ENTER key is typed on the GRS Long TF */
 /* ARGSUSED */
 static void
-jm_grsl_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_grsl_cb (Widget w, XtPointer client, XtPointer call)
 {
 	jm_update (mm_get_now(), 1);
 }
@@ -1021,10 +1018,7 @@ XtPointer call;
 /* callback when the Close button is activated on the stats menu */
 /* ARGSUSED */
 static void
-jm_sstats_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_sstats_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (jsform_w);
 }
@@ -1032,10 +1026,7 @@ XtPointer call;
 /* callback when the More Info button is activated */
 /* ARGSUSED */
 static void
-jm_sstats_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_sstats_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtManageChild (jsform_w);
 	jm_set_buttons(jm_selecting);
@@ -1045,10 +1036,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-jm_cpdmapping_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_cpdmapping_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtSetSensitive (tel_w, telIsOn());
 }
@@ -1059,10 +1047,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-jm_option_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_option_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (client) {
 	    int *flagp = (int *)client;
@@ -1085,10 +1070,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-jm_scale_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_scale_cb (Widget w, XtPointer client, XtPointer call)
 {
 	jm_update (mm_get_now(), 1);
 }
@@ -1097,10 +1079,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-jm_activate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_activate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (jm_selecting) {
 	    char *name;
@@ -1113,10 +1092,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-jt_da_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jt_da_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static int last_nx, last_ny;
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
@@ -1226,10 +1202,7 @@ jt_track_size()
 /* callback when topview dialog is unmapped */
 /* ARGSUSED */
 static void
-jt_unmap_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jt_unmap_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonSetState (topview_w, False, True);
 }
@@ -1237,10 +1210,7 @@ XtPointer call;
 /* callback when main shell is popped down */
 /* ARGSUSED */
 static void
-jm_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (jsform_w);
 	XtUnmanageChild (jtform_w);
@@ -1275,10 +1245,7 @@ XtPointer call;
 /* callback from the main Close button */
 /* ARGSUSED */
 static void
-jm_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* let popdown do all the work */
 	XtPopdown (jupshell_w);
@@ -1287,10 +1254,7 @@ XtPointer call;
 /* callback to add scene to the movie loop */
 /* ARGSUSED */
 static void
-jm_mloop_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_mloop_cb (Widget w, XtPointer client, XtPointer call)
 {
 	ml_add (jm_pm, dt_w);
 }
@@ -1299,10 +1263,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-jm_anim_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_anim_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* best effect if turn off worrying about the sky background */
 	skybkg = 0;
@@ -1315,10 +1276,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-jm_da_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_da_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static int last_nx, last_ny;
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
@@ -1376,10 +1334,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-jm_da_input_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_da_input_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 	ScreenObj *sop;
@@ -1488,10 +1443,7 @@ int justname;
  */
 /* ARGSUSED */
 static void
-jm_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "This is a simple schematic depiction of Jupiter and its moons.",
@@ -1505,10 +1457,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-jm_helpon_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_helpon_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hlp_dialog ((char *)client, NULL, 0);
 }
@@ -1517,10 +1466,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-jm_goto_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_goto_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Obj *op = db_basic (JUPITER);
 	telGoto (op);
@@ -1601,10 +1547,7 @@ int x, y;
  */
 /* ARGSUSED */
 static void
-jm_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+jm_print_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XPSAsk ("Jupiter", jm_print);
 }
diff --git a/GUI/xephem/listmenu.c b/GUI/xephem/listmenu.c
index 671909e..85f9fed 100644
--- a/GUI/xephem/listmenu.c
+++ b/GUI/xephem/listmenu.c
@@ -426,10 +426,7 @@ lst_create_shell()
  */
 /* ARGSUSED */
 static void
-lst_activate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+lst_activate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *t = (XmToggleButtonCallbackStruct *) call;
 	Options op = (Options) client;
@@ -477,10 +474,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-lst_loadcfg_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+lst_loadcfg_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char buf[1024];
 	FILE *fp;
@@ -529,10 +523,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-lst_savecfg_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+lst_savecfg_cb (Widget w, XtPointer client, XtPointer call)
 {
 	FILE *fp;
 	char buf[1024], *txt;
@@ -580,10 +571,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-lst_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+lst_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (lstshell_w);
 }
@@ -592,10 +580,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-lst_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+lst_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "Select fields to become each column of a listing, then run xephem. Each step",
@@ -610,10 +595,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-lst_undo_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+lst_undo_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (nlstflds > 0)
 	    XtUnmanageChild (lstflds[--nlstflds].l_w);
diff --git a/GUI/xephem/mainmenu.c b/GUI/xephem/mainmenu.c
index 1ac7acb..05d9734 100644
--- a/GUI/xephem/mainmenu.c
+++ b/GUI/xephem/mainmenu.c
@@ -458,10 +458,7 @@ mm_external ()
  */
 /* ARGSUSED */
 void
-mm_go_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+mm_go_cb (Widget w, XtPointer client, XtPointer call)
 {
 	mm_gostop ((long int)client);
 }
@@ -1211,10 +1208,7 @@ int whether;
  */
 /* ARGSUSED */
 static void
-mm_activate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+mm_activate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Field *fp = (Field *)client;
 
@@ -1232,10 +1226,7 @@ XtPointer call;
 /* called when user wants XEphem time to stay in sync with computer */
 /* ARGSUSED */
 static void
-keepnow_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+keepnow_cb (Widget w, XtPointer client, XtPointer call)
 {
 	mm_startrt();
 }
@@ -1377,10 +1368,7 @@ mm_stop()
  */
 /* ARGSUSED */
 static void
-mm_step_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+mm_step_cb (Widget w, XtPointer client, XtPointer call)
 {
 	StepOption *sop = (StepOption *)client;
 
@@ -2664,10 +2652,7 @@ ext_readnext()
 /* called when the Ok button is hit in the external file input prompt */
 /* ARGSUSED */
 static void
-ext_ok_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ext_ok_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *name;
 
@@ -2716,10 +2701,7 @@ ext_stop()
 /* called when the Help button is hit in the external file input prompt */
 /* ARGSUSED */
 static void
-ext_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ext_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 static char *hlp[] = {
 "XEphem runs from entries in this file.",
diff --git a/GUI/xephem/marsmenu.c b/GUI/xephem/marsmenu.c
index bb2da22..19853e7 100644
--- a/GUI/xephem/marsmenu.c
+++ b/GUI/xephem/marsmenu.c
@@ -1101,10 +1101,7 @@ int whether;	/* whether setting up for plotting or for not plotting */
 /* callback when an item is de/selected in the feature list */
 /* ARGSUSED */
 static void
-m_list_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_list_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmListCallbackStruct *lp = (XmListCallbackStruct *)call;
 
@@ -1118,10 +1115,7 @@ XtPointer call;
 /* callback from the Moons button */
 /* ARGSUSED */
 static void
-m_moons_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_moons_cb (Widget w, XtPointer client, XtPointer call)
 {
 	marsm_manage();
 }
@@ -1129,10 +1123,7 @@ XtPointer call;
 /* callback from the Close button on the stats menu */
 /* ARGSUSED */
 static void
-m_mstats_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_mstats_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (msform_w);
 }
@@ -1140,10 +1131,7 @@ XtPointer call;
 /* callback when want stats menu up */
 /* ARGSUSED */
 static void
-m_mstats_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_mstats_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtManageChild (msform_w);
 	m_set_buttons(m_selecting);
@@ -1154,10 +1142,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_features_ctrl_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_features_ctrl_cb (Widget w, XtPointer client, XtPointer call)
 {
 	MFSel *mfsp;
 
@@ -1199,10 +1184,7 @@ XtPointer call;
 /* callback when want features dialog up */
 /* ARGSUSED */
 static void
-m_features_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_features_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtManageChild (mfform_w);
 }
@@ -1212,10 +1194,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_feasel_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_feasel_cb (Widget w, XtPointer client, XtPointer call)
 {
 	MFSel *mfsp = (MFSel *) client;
 	mfsp->set = XmToggleButtonGetState(w);
@@ -1224,10 +1203,7 @@ XtPointer call;
 /* callback from the Print PB */
 /* ARGSUSED */
 static void
-m_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_print_cb (Widget w, XtPointer client, XtPointer call)
 {
         XPSAsk ("Mars View", m_print);
 }
@@ -1343,10 +1319,7 @@ m_ps_annotate ()
  */
 /* ARGSUSED */
 static void
-m_selection_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_selection_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (m_selecting) {
 	    char *name;
@@ -1358,10 +1331,7 @@ XtPointer call;
 /* callback from the CML scale */
 /* ARGSUSED */
 static void
-m_cml_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_cml_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmScaleCallbackStruct *sp = (XmScaleCallbackStruct *)call;
 	int v = sp->value;
@@ -1375,10 +1345,7 @@ XtPointer call;
 /* callback from the SLT scale */
 /* ARGSUSED */
 static void
-m_slt_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_slt_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmScaleCallbackStruct *sp = (XmScaleCallbackStruct *)call;
 	int v = sp->value;
@@ -1392,10 +1359,7 @@ XtPointer call;
 /* callback from the Seeing scale */
 /* ARGSUSED */
 static void
-m_see_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_see_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmScaleCallbackStruct *sp = (XmScaleCallbackStruct *)call;
 	char str[32];
@@ -1412,10 +1376,7 @@ XtPointer call;
 /* callback from the Apply PB */
 /* ARGSUSED */
 static void
-m_apply_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_apply_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int v;
 
@@ -1441,10 +1402,7 @@ XtPointer call;
 /* callback from the Point PB */
 /* ARGSUSED */
 static void
-m_aim_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_aim_cb (Widget w, XtPointer client, XtPointer call)
 {
 	m_setnewpos (pu_l, pu_L);
 }
@@ -1475,10 +1433,7 @@ m_setnewpos (double l, double L)
  */
 /* ARGSUSED */
 static void
-m_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (msform_w);
 	XtUnmanageChild (mfform_w);
@@ -1489,10 +1444,7 @@ XtPointer call;
 
 /* called from Close button */
 static void
-m_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (mshell_w);
 	/* popdown will do all the real work */
@@ -1500,10 +1452,7 @@ XtPointer call;
 
 /* called to add scene to the movie loop */
 static void
-m_mloop_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_mloop_cb (Widget w, XtPointer client, XtPointer call)
 {
 	ml_add (m_pm, dt_w);
 }
@@ -1513,10 +1462,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_option_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_option_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Option opt = (Option)client;
 	int set;
@@ -1578,10 +1524,7 @@ swap_colors()
  */
 /* ARGSUSED */
 static void
-m_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 	    "This is a map of Mars.",
@@ -1595,10 +1538,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_helpon_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_helpon_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hlp_dialog ((char *)client, NULL, 0);
 }
@@ -1631,10 +1571,7 @@ m_setsize()
  */
 /* ARGSUSED */
 static void
-m_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 	XExposeEvent *e = &c->event->xexpose;
diff --git a/GUI/xephem/marsmmenu.c b/GUI/xephem/marsmmenu.c
index f431c97..966a592 100644
--- a/GUI/xephem/marsmmenu.c
+++ b/GUI/xephem/marsmmenu.c
@@ -896,10 +896,7 @@ int whether;	/* whether setting up for plotting or for not plotting */
 /* callback when the Close button is activated on the stats menu */
 /* ARGSUSED */
 static void
-marsm_sstats_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_sstats_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (msform_w);
 }
@@ -907,10 +904,7 @@ XtPointer call;
 /* callback when the the More Info button is activated */
 /* ARGSUSED */
 static void
-marsm_sstats_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_sstats_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtManageChild (msform_w);
 	marsm_set_buttons(marsm_selecting);
@@ -920,10 +914,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-marsm_cpdmapping_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_cpdmapping_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtSetSensitive (tel_w, telIsOn());
 }
@@ -934,10 +925,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-marsm_option_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_option_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (client) {
 	    int *flagp = (int *)client;
@@ -960,10 +948,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-marsm_scale_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_scale_cb (Widget w, XtPointer client, XtPointer call)
 {
 	marsm_update (mm_get_now(), 1);
 }
@@ -972,10 +957,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-marsm_activate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_activate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (marsm_selecting) {
 	    char *name;
@@ -988,10 +970,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-mt_da_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+mt_da_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static int last_nx, last_ny;
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
@@ -1101,10 +1080,7 @@ mt_track_size()
 /* callback when topview dialog is unmapped */
 /* ARGSUSED */
 static void
-mt_unmap_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+mt_unmap_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonSetState (topview_w, False, True);
 }
@@ -1112,10 +1088,7 @@ XtPointer call;
 /* callback when main shell is popped down */
 /* ARGSUSED */
 static void
-marsm_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (msform_w);
 	XtUnmanageChild (mtform_w);
@@ -1139,10 +1112,7 @@ XtPointer call;
 /* callback from the main Close button */
 /* ARGSUSED */
 static void
-marsm_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* let popdown do all the work */
 	XtPopdown (mmshell_w);
@@ -1151,10 +1121,7 @@ XtPointer call;
 /* callback to add scene to movie loop */
 /* ARGSUSED */
 static void
-marsm_mloop_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_mloop_cb (Widget w, XtPointer client, XtPointer call)
 {
 	ml_add (marsm_pm, dt_w);
 }
@@ -1163,10 +1130,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-marsm_anim_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_anim_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* best effect if turn off worrying about the sky background */
 	skybkg = 0;
@@ -1179,10 +1143,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-marsm_da_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_da_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static int last_nx, last_ny;
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
@@ -1240,10 +1201,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-marsm_da_input_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_da_input_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 	ScreenObj *sop;
@@ -1351,10 +1309,7 @@ marsm_fill_popup (ScreenObj *sop, int justname)
  */
 /* ARGSUSED */
 static void
-marsm_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "This is a simple schematic depiction of Mars and its moons.",
@@ -1368,10 +1323,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-marsm_helpon_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_helpon_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hlp_dialog ((char *)client, NULL, 0);
 }
@@ -1380,10 +1332,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-marsm_goto_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_goto_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Obj *op = db_basic (MARS);
 	telGoto (op);
@@ -1464,10 +1413,7 @@ int x, y;
  */
 /* ARGSUSED */
 static void
-marsm_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+marsm_print_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XPSAsk ("Martian moons", marsm_print);
 }
diff --git a/GUI/xephem/moonmenu.c b/GUI/xephem/moonmenu.c
index 3e296b0..cd539e0 100644
--- a/GUI/xephem/moonmenu.c
+++ b/GUI/xephem/moonmenu.c
@@ -1196,10 +1196,7 @@ int whether;	/* whether setting up for plotting or for not plotting */
 /* callback from the Apply button in the earthshine dialog */
 /* ARGSUSED */
 static void
-m_eshine_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_eshine_cb (Widget w, XtPointer client, XtPointer call)
 {
 	m_redraw();
 }
@@ -1207,10 +1204,7 @@ XtPointer call;
 /* callback to add the current scene to the movie loop */
 /* ARGSUSED */
 static void
-m_mloop_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_mloop_cb (Widget w, XtPointer client, XtPointer call)
 {
 	ml_add (m_pm, dt_w);
 }
@@ -1218,10 +1212,7 @@ XtPointer call;
 /* callback from the Close button in the earthshine dialog */
 /* ARGSUSED */
 static void
-m_eshineclose_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_eshineclose_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (esform_w);
 }
@@ -1229,10 +1220,7 @@ XtPointer call;
 /* called to toggle whether the earthshine eshineactor is dialog */
 /* ARGSUSED */
 static void
-m_eshineup_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_eshineup_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (XtIsManaged(esform_w))
 	    XtUnmanageChild (esform_w);
@@ -1245,10 +1233,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_mstats_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_mstats_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (msform_w);
 }
@@ -1257,10 +1242,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_mstats_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_mstats_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtManageChild (msform_w);
 	m_set_buttons(m_selecting);
@@ -1269,10 +1251,7 @@ XtPointer call;
 /* callback from the Print PB */
 /* ARGSUSED */
 static void
-m_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_print_cb (Widget w, XtPointer client, XtPointer call)
 {
         XPSAsk ("Moon View", m_print);
 }
@@ -1415,10 +1394,7 @@ m_ps_annotate ()
  */
 /* ARGSUSED */
 static void
-m_activate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_activate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (m_selecting) {
 	    char *name;
@@ -1431,10 +1407,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (esform_w);
 	XtUnmanageChild (msform_w);
@@ -1463,10 +1436,7 @@ XtPointer call;
 
 /* called from Close button */
 static void
-m_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (mshell_w);
 	/* let popdown do all the work */
@@ -1477,10 +1447,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_option_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_option_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Option opt = (Option)client;
 	int set;
@@ -1545,10 +1512,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_shrink_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_shrink_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int f = (long int)client;
 	int set = XmToggleButtonGetState (w);
@@ -1564,10 +1528,7 @@ XtPointer call;
 /* callback to erase all labels */
 /* ARGSUSED */
 static void
-m_elab_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_elab_cb (Widget w, XtPointer client, XtPointer call)
 {
 	MoonDB *mp;
 
@@ -1580,10 +1541,7 @@ XtPointer call;
 /* callback for when the Movie button is activated. */
 /* ARGSUSED */
 static void
-m_anim_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_anim_cb (Widget w, XtPointer client, XtPointer call)
 {
         mm_movie (option[SKY_OPT] ? MOVIE_SSTEPSZ : MOVIE_STEPSZ);
 }
@@ -1592,10 +1550,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 	    "This is a depiction of the Moon.",
@@ -1609,10 +1564,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_helpon_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_helpon_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hlp_dialog ((char *)client, NULL, 0);
 }
@@ -1749,10 +1701,7 @@ Boolean *continue_to_dispatch;
  */
 /* ARGSUSED */
 static void
-m_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 	XExposeEvent *e = &c->event->xexpose;
@@ -3647,10 +3596,7 @@ m_select_cb (Widget w, XtPointer client, XtPointer call)
  */
 /* ARGSUSED */
 static void
-m_pl_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_pl_cb (Widget w, XtPointer client, XtPointer call)
 {
 	MoonDB *mp;
 
@@ -3670,10 +3616,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_copy_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_copy_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Now *np = mm_get_now();
 	MoonDB *mp;
@@ -3694,10 +3637,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-m_showlo_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_showlo_cb (Widget w, XtPointer client, XtPointer call)
 {
 	MoonDB *mp;
 
@@ -3719,10 +3659,7 @@ XtPointer call;
 /* assign the object pointed to by skypu_op to Favorites
  */
 static void
-m_assign_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_assign_cb (Widget w, XtPointer client, XtPointer call)
 {
 	fav_add (skypu_op);
 }
@@ -3886,19 +3823,13 @@ mlo_create_shell()
  */
 /* ARGSUSED */
 static void
-mlo_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+mlo_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 }
 
 /* called from Close button in lunar orbiter window */
 static void
-mlo_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+mlo_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (mlo_shell_w);
 	/* let popdown do all the work */
diff --git a/GUI/xephem/msgmenu.c b/GUI/xephem/msgmenu.c
index c9bb270..931607e 100644
--- a/GUI/xephem/msgmenu.c
+++ b/GUI/xephem/msgmenu.c
@@ -198,10 +198,7 @@ msg_create_w()
 /* callback from the erase pushbutton */
 /* ARGSUSED */
 static void
-msg_erase_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+msg_erase_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmTextReplace (txt_w, 0, txtl, "");
 	txtl = 0;
@@ -211,10 +208,7 @@ XtPointer call;
 /* callback from the close pushbutton */
 /* ARGSUSED */
 static void
-msg_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+msg_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (msg_w);
 }
@@ -222,10 +216,7 @@ XtPointer call;
 /* callback from the help pushbutton */
 /* ARGSUSED */
 static void
-msg_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+msg_help_cb (Widget w, XtPointer client, XtPointer call)
 {
         static char *msg[] = {
 	    "System messages"
@@ -318,10 +309,7 @@ char *p;
 /* callback from the alert message box ok pushbutton */
 /* ARGSUSED */
 static void
-alert_ok_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+alert_ok_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (alert_w);
 }
diff --git a/GUI/xephem/netmenu.c b/GUI/xephem/netmenu.c
index db918ed..41053b0 100644
--- a/GUI/xephem/netmenu.c
+++ b/GUI/xephem/netmenu.c
@@ -1059,10 +1059,7 @@ net_save ()
 /* called from Ok */
 /* ARGSUSED */
 static void
-ok_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ok_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (net_save() == 0)
 	    XtPopdown (netshell_w);
@@ -1071,10 +1068,7 @@ XtPointer call;
 /* called from Ok */
 /* ARGSUSED */
 static void
-cancel_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+cancel_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* outta here */
 	XtPopdown (netshell_w);
@@ -1085,10 +1079,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-pw_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pw_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmTextVerifyCallbackStruct *vp = (XmTextVerifyCallbackStruct *)call;
 	int l = XmTextFieldGetLastPosition(w);
@@ -1117,10 +1108,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-tb_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+tb_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (XmToggleButtonGetState(w)) {
 	    switch ((long int)client) {
@@ -1150,10 +1138,7 @@ XtPointer call;
 /* called from Ok */
 /* ARGSUSED */
 static void
-help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+help_cb (Widget w, XtPointer client, XtPointer call)
 {
         static char *msg[] = {"Set up network connectivity options."};
 
diff --git a/GUI/xephem/objmenu.c b/GUI/xephem/objmenu.c
index 6c0b5c9..a15f421 100644
--- a/GUI/xephem/objmenu.c
+++ b/GUI/xephem/objmenu.c
@@ -796,10 +796,7 @@ obj_unsetinfo()
  */
 /* ARGSUSED */
 static void
-obj_ctl_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+obj_ctl_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int id = (long int) client;
 
@@ -861,10 +858,7 @@ obj_help()
  */
 /* ARGSUSED */
 static void
-obj_type_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+obj_type_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (XmToggleButtonGetState(w))
 	    obj_newlist();
@@ -875,10 +869,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-obj_select_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+obj_select_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int bi = (long int)client;
 	int idx = topi + bi;
@@ -896,10 +887,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-obj_scroll_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+obj_scroll_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmScrollBarCallbackStruct *sp = (XmScrollBarCallbackStruct *)call;
 	int idx = sp->value;
@@ -918,10 +906,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-obj_srch_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+obj_srch_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char last_str[MAXNM];	/* last string we searched for */
 	static int last_idx;		/* index of last match for last_str */
diff --git a/GUI/xephem/plotmenu.c b/GUI/xephem/plotmenu.c
index b3f83e8..1ccb981 100644
--- a/GUI/xephem/plotmenu.c
+++ b/GUI/xephem/plotmenu.c
@@ -488,10 +488,7 @@ plot_create_shell()
  */
 /* ARGSUSED */
 static void
-plt_show_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_show_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *fn;
 
@@ -509,10 +506,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-plt_loadcfg_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_loadcfg_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char buf[1024];
 	FILE *fp;
@@ -564,10 +558,7 @@ XtPointer call;
 /* callback to save current configuration to file named by cfn_w. */
 /* ARGSUSED */
 static void
-plt_savecfg_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_savecfg_cb (Widget w, XtPointer client, XtPointer call)
 {
 	FILE *fp;
 	char *txt, *fn;
@@ -619,10 +610,7 @@ XtPointer call;
 /* callback to allow selecting plot fields */
 /* ARGSUSED */
 static void
-plt_select_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_select_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (XmToggleButtonGetState(w)) {
 	    /* first turn off plotting, if on, while we change things */
@@ -639,10 +627,7 @@ XtPointer call;
 /* callback when user wants to start building a plot file */
 /* ARGSUSED */
 static void
-plt_active_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_active_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (XmToggleButtonGetState(w)) {
 	    /* first turn off selecting, if on */
@@ -661,10 +646,7 @@ XtPointer call;
 /* callback when the main plot window is closed */
 /* ARGSUSED */
 static void
-plt_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 }
 
@@ -672,10 +654,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-plt_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (plotshell_w);
 }
@@ -684,10 +663,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-plt_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 static char *help_msg[] = {
 "This menu controls the plot generation and display functionality of xephem.",
@@ -701,10 +677,7 @@ static char *help_msg[] = {
  */
 /* ARGSUSED */
 static void
-plt_undo_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_undo_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (selecting_xy == X) {
 	    if (npltlines > 0) {
@@ -1208,10 +1181,7 @@ plt_print()
  */
 /* ARGSUSED */
 static void
-plt_da_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_da_print_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Widget da_w = (Widget)client;
 
@@ -1224,10 +1194,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-plt_da_mloop_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_da_mloop_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Widget da_w = (Widget)client;
 	XmUpdateDisplay (da_w);		/* handle expose after pulldown menu */
@@ -1239,10 +1206,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-plt_da_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_da_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild ((Widget)client);
 }
@@ -1252,10 +1216,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-plt_da_unmap_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_da_unmap_cb (Widget w, XtPointer client, XtPointer call)
 {
 	plt_da_destroy ((Widget)client);
 }
@@ -1266,10 +1227,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-plt_da_flipx_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_da_flipx_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *t = (XmToggleButtonCallbackStruct *) call;
 	Widget da_w = (Widget) client;
@@ -1305,10 +1263,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-plt_da_flipy_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_da_flipy_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *t = (XmToggleButtonCallbackStruct *) call;
 	Widget da_w = (Widget) client;
@@ -1344,10 +1299,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-plt_da_grid_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_da_grid_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *t = (XmToggleButtonCallbackStruct *) call;
 	Widget da_w = (Widget) client;
@@ -1383,10 +1335,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-plt_da_xyr_asdate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_da_xyr_asdate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *t = (XmToggleButtonCallbackStruct *) call;
 	Widget da_w = (Widget) client;
@@ -1429,10 +1378,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-plt_da_xjd_asdate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+plt_da_xjd_asdate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *t = (XmToggleButtonCallbackStruct *) call;
 	Widget da_w = (Widget) client;
diff --git a/GUI/xephem/preferences.c b/GUI/xephem/preferences.c
index c92e28a..45d2762 100644
--- a/GUI/xephem/preferences.c
+++ b/GUI/xephem/preferences.c
@@ -312,10 +312,7 @@ PrefSet *pp;
  */
 /* ARGSUSED */
 static void
-pref_date_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pref_date_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *s = (XmToggleButtonCallbackStruct *)call;
 
@@ -330,10 +327,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-pref_units_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pref_units_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *s = (XmToggleButtonCallbackStruct *)call;
 
@@ -348,10 +342,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-pref_tz_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pref_tz_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *s = (XmToggleButtonCallbackStruct *)call;
 
@@ -366,10 +357,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-pref_dpy_prec_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pref_dpy_prec_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *s = (XmToggleButtonCallbackStruct *)call;
 
@@ -384,10 +372,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-pref_topogeo_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pref_topogeo_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *s = (XmToggleButtonCallbackStruct *)call;
 
@@ -402,10 +387,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-pref_msg_bell_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pref_msg_bell_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *s = (XmToggleButtonCallbackStruct *)call;
 
@@ -419,10 +401,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-pref_prefill_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pref_prefill_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *s = (XmToggleButtonCallbackStruct *)call;
 
@@ -436,10 +415,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-pref_tips_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pref_tips_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *s = (XmToggleButtonCallbackStruct *)call;
 
@@ -453,10 +429,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-pref_confirm_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pref_confirm_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *s = (XmToggleButtonCallbackStruct *)call;
 
@@ -470,10 +443,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-pref_weekstart_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pref_weekstart_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *s = (XmToggleButtonCallbackStruct *)call;
 
diff --git a/GUI/xephem/progress.c b/GUI/xephem/progress.c
index 0a15316..9f3e3a6 100644
--- a/GUI/xephem/progress.c
+++ b/GUI/xephem/progress.c
@@ -182,10 +182,7 @@ pm_createshell()
 /* called from the Close PB */
 /* ARGSUSED */
 static void
-pm_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pm_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (pmshell_w);
 }
@@ -194,10 +191,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-pm_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+pm_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 
diff --git a/GUI/xephem/ps.c b/GUI/xephem/ps.c
index 7858e0c..81b1047 100644
--- a/GUI/xephem/ps.c
+++ b/GUI/xephem/ps.c
@@ -2000,10 +2000,7 @@ create_print_w()
  */
 static void
 /* ARGSUSED */
-toggle_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+toggle_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (XmToggleButtonGetState(w)) {
 	    Widget otherw = (Widget)client;
diff --git a/GUI/xephem/query.c b/GUI/xephem/query.c
index 10797c6..ddf23a2 100644
--- a/GUI/xephem/query.c
+++ b/GUI/xephem/query.c
@@ -90,10 +90,7 @@ Widget tw;
  */
 /* ARGSUSED */
 static void
-query_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+query_cb (Widget w, XtPointer client, XtPointer call)
 {
 	void (*f)() = funcs[(long int)client];
 
diff --git a/GUI/xephem/satmenu.c b/GUI/xephem/satmenu.c
index 45e7c3f..7b7b8df 100644
--- a/GUI/xephem/satmenu.c
+++ b/GUI/xephem/satmenu.c
@@ -985,10 +985,7 @@ int whether;	/* whether setting up for plotting or for not plotting */
 /* callback when the Close button is activated on the stats menu */
 /* ARGSUSED */
 static void
-sm_sstats_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_sstats_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (ssform_w);
 }
@@ -996,10 +993,7 @@ XtPointer call;
 /* callback when the More Info button is activated */
 /* ARGSUSED */
 static void
-sm_sstats_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_sstats_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtManageChild (ssform_w);
 	sm_set_buttons(sm_selecting);
@@ -1009,10 +1003,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sm_cpdmapping_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_cpdmapping_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtSetSensitive (tel_w, telIsOn());
 }
@@ -1023,10 +1014,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sm_option_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_option_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (client) {
 	    int *flagp = (int *)client;
@@ -1049,10 +1037,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sm_scale_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_scale_cb (Widget w, XtPointer client, XtPointer call)
 {
 	sm_update (mm_get_now(), 1);
 }
@@ -1061,10 +1046,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sm_activate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_activate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (sm_selecting) {
 	    char *name;
@@ -1077,10 +1059,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-st_da_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+st_da_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static int last_nx, last_ny;
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
@@ -1190,10 +1169,7 @@ st_track_size()
 /* callback when topview dialog is unmapped */
 /* ARGSUSED */
 static void
-st_unmap_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+st_unmap_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonSetState (topview_w, False, True);
 }
@@ -1201,10 +1177,7 @@ XtPointer call;
 /* callback when main shell is popped down */
 /* ARGSUSED */
 static void
-sm_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (ssform_w);
 	XtUnmanageChild (stform_w);
@@ -1231,10 +1204,7 @@ XtPointer call;
 /* callback from the main Close button */
 /* ARGSUSED */
 static void
-sm_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* let pop down do all the work */
 	XtPopdown (satshell_w);
@@ -1243,10 +1213,7 @@ XtPointer call;
 /* callback to add scene to movie loop */
 /* ARGSUSED */
 static void
-sm_mloop_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_mloop_cb (Widget w, XtPointer client, XtPointer call)
 {
 	ml_add (sm_pm, dt_w);
 }
@@ -1255,10 +1222,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sm_anim_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_anim_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* smoother if turn off the sky background */
 	skybkg = 0;
@@ -1271,10 +1235,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sm_da_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_da_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static int last_nx, last_ny;
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
@@ -1332,10 +1293,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sm_da_input_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_da_input_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 	ScreenObj *sop;
@@ -1444,10 +1402,7 @@ int justname;
  */
 /* ARGSUSED */
 static void
-sm_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "This is a simple schematic depiction of Saturn and its moons.",
@@ -1461,10 +1416,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sm_helpon_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_helpon_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hlp_dialog ((char *)client, NULL, 0);
 }
@@ -1473,10 +1425,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sm_goto_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_goto_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Obj *op = db_basic (SATURN);
 	telGoto (op);
@@ -1557,10 +1506,7 @@ int x, y;
  */
 /* ARGSUSED */
 static void
-sm_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sm_print_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XPSAsk ("Saturn", sm_print);
 }
diff --git a/GUI/xephem/scope.c b/GUI/xephem/scope.c
index bfaf04d..906a1a8 100644
--- a/GUI/xephem/scope.c
+++ b/GUI/xephem/scope.c
@@ -517,10 +517,7 @@ Widget *b_wp)		/* intercept TF widget, or NULL */
 /* called when the help button is hit */
 /* ARGSUSED */
 static void
-sc_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sc_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 	    "Configure how INDI services connect with XEphem."
diff --git a/GUI/xephem/sites.c b/GUI/xephem/sites.c
index ff1f04c..8c06675 100644
--- a/GUI/xephem/sites.c
+++ b/GUI/xephem/sites.c
@@ -720,10 +720,7 @@ sites_cmpf (const void * v1, const void * v2)
  */
 /* ARGSUSED */
 static void
-sq_set_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sq_set_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *str = XmTextFieldGetString (settf_w);
 	int i;
@@ -747,10 +744,7 @@ XtPointer call;
 /* called when CR is hit in the search text field /or/ from Search PB */
 /* ARGSUSED */
 static void
-sq_search_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sq_search_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *str;
 	int i;
@@ -770,10 +764,7 @@ XtPointer call;
 /* called when an item in the scrolled list is double-clicked */
 /* ARGSUSED */
 static void
-sq_dblclick_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sq_dblclick_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int *pos, npos;
 	int free;
@@ -795,10 +786,7 @@ XtPointer call;
 /* called when an item in the scrolled list is single-clicked */
 /* ARGSUSED */
 static void
-sq_click_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sq_click_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int *pos, npos;
 	int free;
@@ -820,10 +808,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sq_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sq_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "Load and select from a list of sites."
@@ -835,10 +820,7 @@ XtPointer call;
 /* called when the Cancel button is hit */
 /* ARGSUSED */
 static void
-sq_cancel_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sq_cancel_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (sq_w);
 }
@@ -846,10 +828,7 @@ XtPointer call;
 /* called when the Add TB is hit */
 /* ARGSUSED */
 static void
-sq_create_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sq_create_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (XmToggleButtonGetState (w))
 	    XtManageChild (newf_w);
@@ -860,10 +839,7 @@ XtPointer call;
 /* called when the Set main PB is hit */
 /* ARGSUSED */
 static void
-sq_setmain_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sq_setmain_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Site ns;
 
@@ -875,10 +851,7 @@ XtPointer call;
 /* called when the Save PB is hit */
 /* ARGSUSED */
 static void
-sq_save_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sq_save_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char fn[1024];
 	Site ns;
diff --git a/GUI/xephem/skybinary.c b/GUI/xephem/skybinary.c
index 2c70346..ac81f3b 100644
--- a/GUI/xephem/skybinary.c
+++ b/GUI/xephem/skybinary.c
@@ -185,10 +185,7 @@ bs_create_shell_w()
  */
 /* ARGSUSED */
 static void
-bs_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+bs_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
         Window win = XtWindow(w);
diff --git a/GUI/xephem/skyeyep.c b/GUI/xephem/skyeyep.c
index 53df7b6..a01efb9 100644
--- a/GUI/xephem/skyeyep.c
+++ b/GUI/xephem/skyeyep.c
@@ -1023,10 +1023,7 @@ Widget s_w, l_w;
 
 /* called when the telrad TB is activated */
 static void
-se_telrad_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_telrad_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int set = XmToggleButtonGetState (w);
 
@@ -1053,10 +1050,7 @@ XtPointer call;
 
 /* drag callback from the height scale */
 static void
-se_hscale_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_hscale_cb (Widget w, XtPointer client, XtPointer call)
 {
 	se_scale_fmt (eyephs_w, eyephl_w);
 
@@ -1070,10 +1064,7 @@ XtPointer call;
 
 /* drag callback from the width scale */
 static void
-se_wscale_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_wscale_cb (Widget w, XtPointer client, XtPointer call)
 {
 	se_scale_fmt (eyepws_w, eyepwl_w);
 
@@ -1087,10 +1078,7 @@ XtPointer call;
 
 /* drag callback from the pa scale */
 static void
-se_pscale_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_pscale_cb (Widget w, XtPointer client, XtPointer call)
 {
 	se_pascale_fmt (eyepa_w, eyepal_w);
 }
@@ -1099,10 +1087,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-se_delall_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_delall_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (eyep) {
 	    if (confirm()) {
@@ -1144,10 +1129,7 @@ se_delall()
  */
 /* ARGSUSED */
 static void
-se_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (eyep_w);
 }
@@ -1155,10 +1137,7 @@ XtPointer call;
 /* called when the help button is hit in the eyepiece dialog */
 /* ARGSUSED */
 static void
-se_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 	    "Define eyepiece shapes and sizes."
@@ -1173,10 +1152,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-se_skyW_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_skyW_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Widget angle_w = (Widget)client;
 	char *str;
@@ -1198,10 +1174,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-se_skyH_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_skyH_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Widget angle_w = (Widget)client;
 	char *str;
@@ -1221,10 +1194,7 @@ XtPointer call;
 /* called when any of the factors in formula 1 change */
 /* ARGSUSED */
 static void
-se_calc1_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_calc1_cb (Widget w, XtPointer client, XtPointer call)
 {
 	se_calc1();
 }
@@ -1268,10 +1238,7 @@ se_calc1()
 /* called when any of the factors in formula 2 change */
 /* ARGSUSED */
 static void
-se_calc2_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_calc2_cb (Widget w, XtPointer client, XtPointer call)
 {
 	se_calc2();
 }
@@ -1363,10 +1330,7 @@ Widget w;
  */
 /* ARGSUSED */
 static void
-se_usefav_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_usefav_cb (Widget w, XtPointer client, XtPointer call)
 {
 	FavEyeP *fp = &favs[(long int)client];
 
@@ -1385,10 +1349,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-se_delfav_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_delfav_cb (Widget w, XtPointer client, XtPointer call)
 {
 	FavEyeP *fp = &favs[(long int)client];
 	XtDestroyWidget (fp->row_w);
@@ -1398,10 +1359,7 @@ XtPointer call;
 /* called to add a new FavEyeP */
 /* ARGSUSED */
 static void
-se_addfav_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_addfav_cb (Widget w, XtPointer client, XtPointer call)
 {
 	FavEyeP newfav;
 	double aunused;
@@ -1417,10 +1375,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-se_loadd_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_loadd_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *fn;
 	get_xmstring (w, XmNlabelString, &fn);
@@ -1433,10 +1388,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-se_saved_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_saved_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char buf[1024], *fn;
 	char *txt;
@@ -1460,10 +1412,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-se_loadp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_loadp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *fn;
 	get_xmstring (w, XmNlabelString, &fn);
@@ -1476,10 +1425,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-se_savep_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+se_savep_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char buf[1024], *fn;
 	char *txt;
diff --git a/GUI/xephem/skyfiltmenu.c b/GUI/xephem/skyfiltmenu.c
index 3859546..9c081b3 100644
--- a/GUI/xephem/skyfiltmenu.c
+++ b/GUI/xephem/skyfiltmenu.c
@@ -702,10 +702,7 @@ Obj *op;
  */
 /* ARGSUSED */
 static void
-svf_da_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svf_da_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 	FilterTB *ftbp = (FilterTB *) client;
@@ -789,10 +786,7 @@ Widget daw;
 /* called when either mag scale is dragged */
 /* ARGSUSED */
 static void
-svf_magdrag_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svf_magdrag_cb (Widget w, XtPointer client, XtPointer call)
 {
 	sv_amagoff();
 }
@@ -800,10 +794,7 @@ XtPointer call;
 /* called when Apply is pushed on the filter dialog */
 /* ARGSUSED */
 static void
-svf_apply_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svf_apply_cb (Widget w, XtPointer client, XtPointer call)
 {
 	svf_apply();
 	sv_all(mm_get_now());
@@ -812,10 +803,7 @@ XtPointer call;
 /* called when Ok is pushed on the filter dialog */
 /* ARGSUSED */
 static void
-svf_ok_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svf_ok_cb (Widget w, XtPointer client, XtPointer call)
 {
 	svf_apply();
 	sv_all(mm_get_now());
@@ -825,10 +813,7 @@ XtPointer call;
 /* called when Close is pushed on the filter dialog */
 /* ARGSUSED */
 static void
-svf_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svf_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (filter_w);
 }
@@ -837,10 +822,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-svf_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svf_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "This allows settings the types of objects to display."
@@ -852,10 +834,7 @@ XtPointer call;
 /* called when Toggle is pushed on the filter dialog */
 /* ARGSUSED */
 static void
-svf_toggle_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svf_toggle_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int i, j;
 
@@ -872,10 +851,7 @@ XtPointer call;
 /* called when All is pushed on the filter dialog */
 /* ARGSUSED */
 static void
-svf_all_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svf_all_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int i, j;
 
@@ -891,10 +867,7 @@ XtPointer call;
 /* called when Reset is pushed on the filter dialog */
 /* ARGSUSED */
 static void
-svf_reset_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svf_reset_cb (Widget w, XtPointer client, XtPointer call)
 {
 	svf_reset();
 }
@@ -904,10 +877,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-svf_cat_toggle_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svf_cat_toggle_cb (Widget w, XtPointer client, XtPointer call)
 {
 	FilterCat *fcp = (FilterCat *) client;
 	int i;
diff --git a/GUI/xephem/skyfits.c b/GUI/xephem/skyfits.c
index 22e20be..9d8d5d0 100644
--- a/GUI/xephem/skyfits.c
+++ b/GUI/xephem/skyfits.c
@@ -700,10 +700,7 @@ Widget fsb_w;
 /* callback from the Public dir PB */
 /* ARGSUSED */
 static void
-sharedDirCB (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sharedDirCB (Widget w, XtPointer client, XtPointer call)
 {
 	Widget fsb_w = (Widget)client;
 	char buf[1024];
@@ -715,10 +712,7 @@ XtPointer call;
 /* callback from the Private dir PB */
 /* ARGSUSED */
 static void
-privateDirCB (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+privateDirCB (Widget w, XtPointer client, XtPointer call)
 {
 	Widget fsb_w = (Widget)client;
 
@@ -760,10 +754,7 @@ Widget rc_w, fsb_w;
 /* called when Watch TB changes */
 /* ARGSUSED */
 static void
-fw_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+fw_cb (Widget w, XtPointer client, XtPointer call)
 {
 	fw_on (XmToggleButtonGetState(w));
 }
@@ -771,10 +762,7 @@ XtPointer call;
 /* called when Get PB or toolbar PB is hit */
 /* ARGSUSED */
 void
-sf_go_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sf_go_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (!sf_w) {
 	    sf_create();
@@ -795,10 +783,7 @@ XtPointer call;
 /* called when CR is hit in the Save text field or the Save PB is hit */
 /* ARGSUSED */
 static void
-sf_save_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sf_save_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *fn;
 
@@ -864,10 +849,7 @@ save_file()
 /* called when a file selected by the FSB is to be opened */
 static void
 /* ARGSUSED */
-sf_open_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sf_open_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmFileSelectionBoxCallbackStruct *s =
 				    (XmFileSelectionBoxCallbackStruct *)call;
@@ -889,20 +871,14 @@ XtPointer call;
 
 /* ARGSUSED */
 static void
-sf_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sf_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (sf_w);
 }
 
 /* ARGSUSED */
 static void
-sf_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sf_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "Read in local FITS files or read from Network.",
@@ -915,10 +891,7 @@ XtPointer call;
 /* callback to set main time to match FITS */
 /* ARGSUSED */
 static void
-sf_setdate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sf_setdate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	double newmjd;
 
diff --git a/GUI/xephem/skyhist.c b/GUI/xephem/skyhist.c
index 1da5fbe..3710d19 100644
--- a/GUI/xephem/skyhist.c
+++ b/GUI/xephem/skyhist.c
@@ -403,10 +403,7 @@ int i;
 /* called just as the pulldown menu is cascading */
 /* ARGSUSED */
 static void
-svh_cascading_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_cascading_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int i;
 
@@ -442,10 +439,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-svh_ltfc_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_ltfc_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int i = (long int)client;
 
@@ -457,10 +451,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-svh_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "Collects and Installs collections of Sky View settings",
@@ -473,10 +464,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-svh_manage_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_manage_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopup (svhshell_w, XtGrabNone);
 	set_something (svhshell_w, XmNiconic, (XtArgVal)False);
@@ -485,10 +473,7 @@ XtPointer call;
 /* callback from the Close PB */
 /* ARGSUSED */
 static void
-svh_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (svhshell_w);
 }
@@ -496,10 +481,7 @@ XtPointer call;
 /* called when the Add button is hit in the history window */
 /* ARGSUSED */
 static void
-svh_add_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_add_cb (Widget w, XtPointer client, XtPointer call)
 {
 	svh_add_current();
 }
@@ -525,10 +507,7 @@ del_i()
  */
 /* ARGSUSED */
 static void
-svh_del_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_del_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* save index */
 	deli = (long int)client;
@@ -562,10 +541,7 @@ rep_i()
  */
 /* ARGSUSED */
 static void
-svh_rep_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_rep_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* save index */
 	repi = (long int)client;
@@ -586,10 +562,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-svh_go_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_go_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int i = (long int)client;
 	svh_goto (&hist[i].h);
@@ -600,10 +573,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-svh_up_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_up_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int i = (long int)client;
 	SVHEntry tmp;
@@ -626,10 +596,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-svh_down_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_down_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int i = (long int)client;
 	SVHEntry tmp;
@@ -678,10 +645,7 @@ SvHistory *hp;
 /* called when the Save button is hit */
 /* ARGSUSED */
 static void
-svh_save_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_save_cb (Widget w, XtPointer client, XtPointer call)
 {
 	FILE *histfp;
 	SvHistory *hp;
@@ -733,10 +697,7 @@ XtPointer call;
 /* called when the Load button is hit in the history pulldown */
 /* ARGSUSED */
 static void
-svh_load_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svh_load_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char fn[1024];
 	char buf[1024];
diff --git a/GUI/xephem/skyip.c b/GUI/xephem/skyip.c
index 38e06b7..8e97083 100644
--- a/GUI/xephem/skyip.c
+++ b/GUI/xephem/skyip.c
@@ -2407,10 +2407,7 @@ si_ne()
 /* mark refstar on the image */
 /* ARGSUSED */
 static void
-si_markrefstar_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_markrefstar_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (!fimok)
 	    xe_msg (1, "First open an image");
@@ -2425,10 +2422,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-si_newrefstar_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_newrefstar_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (!fimok)
 	    xe_msg (1, "First open an image");
@@ -2447,10 +2441,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-si_newref_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_newref_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (!fimok)
 	    xe_msg (1, "First open an image");
@@ -2466,10 +2457,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-si_managetb_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_managetb_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int state = XmToggleButtonGetState(w);
 	Widget sw = (Widget)client;
@@ -2493,10 +2481,7 @@ XtPointer call;
 
 /* ARGSUSED */
 static void
-si_lohi_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_lohi_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *lostr = XmTextFieldGetString (lo_w);
 	char *histr = XmTextFieldGetString (hi_w);
@@ -2524,10 +2509,7 @@ XtPointer call;
 
 /* ARGSUSED */
 static void
-si_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (si_w);
 }
@@ -2537,10 +2519,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-si_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *tag = (char *)client;
 
@@ -2663,10 +2642,7 @@ Boolean *continue_to_dispatch;
 /* expose callback for the gray map */
 /* ARGSUSED */
 static void
-si_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 	Display *dsp = XtDisplay(fda_w);
@@ -2704,10 +2680,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-si_contrast_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_contrast_cb (Widget w, XtPointer client, XtPointer call)
 {
 	void (*pfv)() = (void (*)())client;
 
@@ -2730,10 +2703,7 @@ XtPointer call;
 /* callback from Drag or ValueChanged on the gamma scale */
 /* ARGSUSED */
 static void
-si_gamma_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_gamma_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (!fimok)
 	    return;
@@ -2751,10 +2721,7 @@ XtPointer call;
 /* callback for the gray map Inverse Vid TB */
 /* ARGSUSED */
 static void
-si_inv_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_inv_cb (Widget w, XtPointer client, XtPointer call)
 {
 	want_inv = XmToggleButtonGetState(w);
 
@@ -3499,10 +3466,7 @@ int rw;
 
 /* ARGSUSED */
 static void
-si_wcsclose_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_wcsclose_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (wcs_w);
 }
@@ -3510,10 +3474,7 @@ XtPointer call;
 /* called to start a WCS solution */
 /* ARGSUSED */
 static void
-si_wcsgo_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_wcsgo_cb (Widget w, XtPointer client, XtPointer call)
 {
 	watch_cursor (1);
 	wcsMatch ();
@@ -3523,10 +3484,7 @@ XtPointer call;
 /* called to mark seed stars */
 /* ARGSUSED */
 static void
-si_markstars_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_markstars_cb (Widget w, XtPointer client, XtPointer call)
 {
 	double *sx, *sy;
 	int burnt;
@@ -3583,10 +3541,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-si_wcsuse_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_wcsuse_cb (Widget w, XtPointer client, XtPointer call)
 {
 	WCSSeed *wsp = (WCSSeed *)client;
 	char msg[1024];
@@ -3603,10 +3558,7 @@ XtPointer call;
 
 /* ARGSUSED */
 static void
-si_wcshelp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+si_wcshelp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 	    "Pattern match with field stars to find a WCS solution."
diff --git a/GUI/xephem/skylist.c b/GUI/xephem/skylist.c
index cdfcc73..4679989 100644
--- a/GUI/xephem/skylist.c
+++ b/GUI/xephem/skylist.c
@@ -565,10 +565,7 @@ Widget f_w;
  */
 /* ARGSUSED */
 static void
-sl_toggle_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sl_toggle_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int set = XmToggleButtonGetState(w);
 	Widget otherw = (Widget)client;
@@ -579,10 +576,7 @@ XtPointer call;
 /* called when the Close button is hit in the file list prompt */
 /* ARGSUSED */
 static void
-sl_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sl_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (list_w);
 }
@@ -590,10 +584,7 @@ XtPointer call;
 /* called when the help button is hit in the file list prompt */
 /* ARGSUSED */
 static void
-sl_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sl_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 	    "List and Save Sky View objects in two formats."
@@ -627,10 +618,7 @@ sl_clearlast()
 /* called when the Clear button is hit */
 /* ARGSUSED */
 static void
-sl_clear_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sl_clear_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* clear all */
 	while (nsortorder)
@@ -640,10 +628,7 @@ XtPointer call;
 /* called when the Undo button is hit */
 /* ARGSUSED */
 static void
-sl_undo_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sl_undo_cb (Widget w, XtPointer client, XtPointer call)
 {
 	sl_clearlast();
 }
@@ -653,10 +638,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sl_so_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sl_so_cb (Widget w, XtPointer client, XtPointer call)
 {
 	SortInfo *sip = (SortInfo *)client;
 	char buf[10];
@@ -679,10 +661,7 @@ XtPointer call;
 /* called when the Sort button is hit */
 /* ARGSUSED */
 static void
-sl_sort_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sl_sort_cb (Widget w, XtPointer client, XtPointer call)
 {
 	sl_sort();
 }
@@ -690,10 +669,7 @@ XtPointer call;
 /* called when the Save button is hit */
 /* ARGSUSED */
 static void
-sl_save_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sl_save_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *fn;
 
@@ -730,10 +706,7 @@ XtPointer call;
 /* called when the Mark button is hit on the popup */
 /* ARGSUSED */
 static void
-slpu_mark_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+slpu_mark_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* sanity check */
 	if (!pu.op)
@@ -745,10 +718,7 @@ XtPointer call;
 /* called when the Delete button is hit on the popup */
 /* ARGSUSED */
 static void
-slpu_del_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+slpu_del_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *txt;
 	int end;
diff --git a/GUI/xephem/skytoolbar.c b/GUI/xephem/skytoolbar.c
index e5cb007..96f758b 100644
--- a/GUI/xephem/skytoolbar.c
+++ b/GUI/xephem/skytoolbar.c
@@ -1051,10 +1051,7 @@ svtb_gaussIsOn()
  * client is ct list.
  */
 static void
-svtb_ct_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_ct_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int set = XmToggleButtonGetState(w);
 	char *types = (char *)client;
@@ -1081,10 +1078,7 @@ XtPointer call;
  * client is tt list.
  */
 static void
-svtb_tt_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_tt_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int set = XmToggleButtonGetState(w);
 	ObjType_t *types = (ObjType_t *)client;
@@ -1107,10 +1101,7 @@ XtPointer call;
  * activate the Cyl TB to the opposite state.
  */
 static void
-svtb_sph_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_sph_cb (Widget w, XtPointer client, XtPointer call)
 {
 	SVTBarItem *ip = findSVTB (cyl_bits);
 
@@ -1121,10 +1112,7 @@ XtPointer call;
  * slace the Sph TB to the opposite state.
  */
 static void
-svtb_cyl_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_cyl_cb (Widget w, XtPointer client, XtPointer call)
 {
 	SVTBarItem *ip = findSVTB (sph_bits);
 
@@ -1135,20 +1123,14 @@ XtPointer call;
  * client is addr of int to set.
  */
 static void
-svtb_toggle_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_toggle_cb (Widget w, XtPointer client, XtPointer call)
 {
 	*(int *)client = XmToggleButtonGetState(w);
 }
 
 /* monument toggle */
 static void
-svtb_monument_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_monument_cb (Widget w, XtPointer client, XtPointer call)
 {
 	monument_on = XmToggleButtonGetState(w);
 	if (si_ison())
@@ -1157,10 +1139,7 @@ XtPointer call;
 
 /* contrast toggle */
 static void
-svtb_contrast_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_contrast_cb (Widget w, XtPointer client, XtPointer call)
 {
 	contrast_on = XmToggleButtonGetState(w);
 	si_updateContrast(contrast_on);
@@ -1168,10 +1147,7 @@ XtPointer call;
 
 /* glass toggle */
 static void
-svtb_glass_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_glass_cb (Widget w, XtPointer client, XtPointer call)
 {
 	glass_on = XmToggleButtonGetState(w);
 	si_updateGlass(glass_on);
@@ -1179,10 +1155,7 @@ XtPointer call;
 
 /* roi toggle */
 static void
-svtb_roi_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_roi_cb (Widget w, XtPointer client, XtPointer call)
 {
 	roi_on = XmToggleButtonGetState(w);
 	si_updateROI(roi_on);
@@ -1190,10 +1163,7 @@ XtPointer call;
 
 /* gauss toggle */
 static void
-svtb_gauss_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_gauss_cb (Widget w, XtPointer client, XtPointer call)
 {
 	gauss_on = XmToggleButtonGetState(w);
 	si_updateGauss(gauss_on);
@@ -1201,10 +1171,7 @@ XtPointer call;
 
 /* slice toggle */
 static void
-svtb_slice_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_slice_cb (Widget w, XtPointer client, XtPointer call)
 {
 	slice_on = XmToggleButtonGetState(w);
 	si_updateSlice(slice_on);
diff --git a/GUI/xephem/skyviewmenu.c b/GUI/xephem/skyviewmenu.c
index 4d25258..8113367 100644
--- a/GUI/xephem/skyviewmenu.c
+++ b/GUI/xephem/skyviewmenu.c
@@ -845,10 +845,7 @@ sv_amagoff ()
 
 /* called when the toolbar "brighter" PB is hit */
 void
-svtb_brighter_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_brighter_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int stmag, ssmag, dsmag, magstp;
 
@@ -865,10 +862,7 @@ XtPointer call;
  * client is 0 for l/r, else 1 for t/b
  */
 void
-svtb_flip_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_flip_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int tb = (long int)client;
 
@@ -880,10 +874,7 @@ XtPointer call;
 
 /* called when the toolbar "constel" TB changes */
 void
-svtb_constel_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_constel_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static int want_conb_atoff = -1;	/* flag as uninitialized */
 	static int want_conf_atoff;
@@ -926,10 +917,7 @@ XtPointer call;
 
 /* called when the toolbar "dimmer" PB is hit */
 void
-svtb_dimmer_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_dimmer_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int stmag, ssmag, dsmag, magstp;
 
@@ -944,10 +932,7 @@ XtPointer call;
 
 /* called when the toolbar "grid" TB changes */
 void
-svtb_grid_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_grid_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int onnow = XmToggleButtonGetState(grid_w);
 
@@ -965,10 +950,7 @@ XtPointer call;
 
 /* called when the toolbar "automag" TB changes */
 void
-svtb_automag_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_automag_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonSetState (wantamag_w,
 				    !XmToggleButtonGetState(wantamag_w), True);
@@ -976,20 +958,14 @@ XtPointer call;
 
 /* called when the toolbar "horizon" TB changes */
 void
-svtb_hzn_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_hzn_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonSetState (hznmap_w, !XmToggleButtonGetState(hznmap_w), 1);
 }
 
 /* called when the toolbar "live report" TB changes */
 void
-svtb_report_cb(w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_report_cb (Widget w, XtPointer client, XtPointer call)
 {
 	want_report = XmToggleButtonGetState(w);
 	XmToggleButtonSetState (wantreport_w, want_report, 1);
@@ -998,20 +974,14 @@ XtPointer call;
 
 /* called when the toolbar "field stars" TB is hit */
 void
-svtb_fstars_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_fstars_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonSetState (wantfs_w, !XmToggleButtonGetState(wantfs_w), 1);
 }
 
 /* called when the toolbar "names" TB changes */
 void
-svtb_names_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_names_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static int lbl_lst_atoff = -1;		/* flag as uninitialized */
 	static int lbl_lfs_atoff;
@@ -1075,10 +1045,7 @@ svtb_reportIsOn()
 
 /* called when the toolbar "planes" TB changes */
 void
-svtb_planes_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_planes_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static int want_eq_atoff = -1;		/* flag as uninitialized */
 	static int want_ga_atoff;
@@ -1116,20 +1083,14 @@ XtPointer call;
 
 /* called when the toolbar "magscale" TB changes */
 void
-svtb_magscale_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_magscale_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonSetState (wantmag_w, XmToggleButtonGetState(w), True);
 }
 
 /* called when the toolbar "orient" TB changes */
 void
-svtb_orient_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_orient_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (aa_mode)
 	    XmToggleButtonSetState (rad_w, True, True);
@@ -1139,30 +1100,21 @@ XtPointer call;
 
 /* called when the toolbar "cylindrical projection" TB is hit */
 void
-svtb_proj_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_proj_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonSetState (sph_w, !XmToggleButtonGetState(w), True);
 }
 
 /* called when the toolbar "print" PB is hit */
 void
-svtb_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_print_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XPSAsk ("Sky View", sv_print);
 }
 
 /* called when the toolbar "zoom in" PB is hit */
 void
-svtb_zoomin_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_zoomin_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* asserts */
 	if (zm_cundo < 0) {
@@ -1197,10 +1149,7 @@ XtPointer call;
 
 /* called when the toolbar "unzoom" PB is hit */
 void
-svtb_unzoom_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+svtb_unzoom_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* asserts */
 	if (!zm_undo || zm_cundo <= 0) {
@@ -3674,10 +3623,7 @@ Widget rc_w;
 /* callback from selecting the Close PB in the Options control. */
 /* ARGSUSED */
 static void
-sv_closeopdialog_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_closeopdialog_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (svops_w);
 }
@@ -3685,10 +3631,7 @@ XtPointer call;
 /* callback from selecting the Options control. */
 /* ARGSUSED */
 static void
-sv_opdialog_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_opdialog_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (!XtIsManaged(svops_w))
 	    XtManageChild (svops_w);
@@ -3723,10 +3666,7 @@ Widget parent;
 /* callback from the main Close button */
 /* ARGSUSED */
 static void
-sv_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* let popdown do all the work */
 	XtPopdown (svshell_w);
@@ -3737,10 +3677,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (svops_w);
 	sl_unmanage ();
@@ -3766,10 +3703,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "This displays all database objects currently in memory onto the sky. The view",
@@ -3786,10 +3720,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_helpon_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_helpon_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hlp_dialog ((char *)client, NULL, 0);
 }
@@ -3799,10 +3730,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_cyl_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_cyl_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonCallbackStruct *sp = (XmToggleButtonCallbackStruct *)call;
 	int cyl = (w == cyl_w);
@@ -3833,10 +3761,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_aa_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_aa_cb (Widget w, XtPointer client, XtPointer call)
 {
 #define	POLEERR		degrad(90 - 1.0/3600.0)	/* polar ambiguous area */
 	XmToggleButtonCallbackStruct *sp = (XmToggleButtonCallbackStruct *)call;
@@ -3905,10 +3830,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_filter_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_filter_cb (Widget w, XtPointer client, XtPointer call)
 {
 	svf_manage();
 }
@@ -3918,10 +3840,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_fits_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_fits_cb (Widget w, XtPointer client, XtPointer call)
 {
 	sf_manage();
 }
@@ -3931,10 +3850,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_image_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_image_cb (Widget w, XtPointer client, XtPointer call)
 {
 	si_manage();
 }
@@ -3943,10 +3859,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_registration_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_registration_cb (Widget w, XtPointer client, XtPointer call)
 {
 	ir_manage();
 }
@@ -3956,10 +3869,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_wcs_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_wcs_cb (Widget w, XtPointer client, XtPointer call)
 {
 	siwcs_manage();
 }
@@ -3968,10 +3878,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_addframe_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_addframe_cb (Widget w, XtPointer client, XtPointer call)
 {
 	ml_add (sv_pm, dt_w);
 }
@@ -3981,10 +3888,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_list_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_list_cb (Widget w, XtPointer client, XtPointer call)
 {
 	sl_manage();
 }
@@ -3994,10 +3898,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_gt_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_gt_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Widget pw = (Widget)client;
 
@@ -4010,10 +3911,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_grid_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_grid_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int state = XmToggleButtonGetState(w);
 	int *wantp = (int *)client;
@@ -4039,10 +3937,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_brs_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_brs_cb (Widget w, XtPointer client, XtPointer call)
 {
 	sv_all(mm_get_now());
 }
@@ -4050,10 +3945,7 @@ XtPointer call;
 /* callback from RETURN in either grid size TF */
 /* ARGSUSED */
 static void
-sv_gridtf_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_gridtf_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* turns off Auto as a side effect */
 	XmToggleButtonSetState (autogrid_w, want_autogrid = False, True);
@@ -4066,10 +3958,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_mancoord_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_mancoord_cb (Widget w, XtPointer client, XtPointer call)
 {
 	cc_manage();
 }
@@ -4078,10 +3967,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_print_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XPSAsk ("Sky View", sv_print);
 }
@@ -4356,10 +4242,7 @@ Now *np;
  */
 /* ARGSUSED */
 static void
-sv_track_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_track_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (!XmToggleButtonGetState (w)) {
 	    track_op = (Obj *)0;
@@ -5051,10 +4934,7 @@ sv_pick (XEvent *ev, int wx, int wy)
  */
 /* ARGSUSED */
 static void
-sv_scale_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_scale_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmScaleCallbackStruct *s = (XmScaleCallbackStruct *)call;
 	int which = (long int) client;
@@ -5110,10 +4990,7 @@ sv_loadcnsfigs_cb (Widget w, XtPointer client, XtPointer call)
  */
 /* ARGSUSED */
 static void
-sv_lbln_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_lbln_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int *lp = (int *)client;
 
@@ -5135,10 +5012,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_lblm_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_lblm_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int *lp = (int *)client;
 
@@ -5160,10 +5034,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_option_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_option_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int *p = (int *)client;
 
@@ -5230,10 +5101,7 @@ XtPointer call;
 /* called to bring up the eyepiece control dialog */
 /* ARGSUSED */
 static void
-sv_eyep_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_eyep_cb (Widget w, XtPointer client, XtPointer call)
 {
 	se_manage();
 }
@@ -5241,10 +5109,7 @@ XtPointer call;
 /* called to bring up the binary star orbit map */
 /* ARGSUSED */
 static void
-sv_bsmap_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_bsmap_cb (Widget w, XtPointer client, XtPointer call)
 {
 	svbs_manage(pu.op);
 }
@@ -5255,10 +5120,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_faving_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_faving_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Obj **favs;
 	int nfavs = fav_get_loaded (&favs);
@@ -5293,10 +5155,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_fav_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_fav_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XEvent *ev = ((XmAnyCallbackStruct*)call)->event;
 	Obj **favs, *op;
@@ -6632,10 +6491,7 @@ Widget pd_w;
  */
 /* ARGSUSED */
 static void
-sv_pu_activate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_pu_activate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int code = (long int)client;
 	Obj *op = pu.tsp ? &pu.tsp->o : pu.op;
@@ -6721,10 +6577,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_pu_zoom_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_pu_zoom_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int factor = (long int)client;
 	double newfov = sv_vfov*10.0/factor;
@@ -6803,10 +6656,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_pu_track_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_pu_track_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (XmToggleButtonGetState (w)) {
 	    track_op = pu.op;
@@ -10257,10 +10107,7 @@ zm_draw()
  * client is secret code.. see various XtAdds
  */
 static void
-sv_fovsc_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_fovsc_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int code = (long int)client;
 
@@ -10302,10 +10149,7 @@ XtPointer call;
  * client is desired position, in degrees.
  */
 static void
-sv_altdecsc_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_altdecsc_cb (Widget w, XtPointer client, XtPointer call)
 {
 	si_off();
 	sv_altdec = degrad((long int)client);
@@ -10316,10 +10160,7 @@ XtPointer call;
 /* bring up telescope configure window */
 /* ARGSUSED */
 static void
-sv_tcp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_tcp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	sc_manage();
 }
@@ -10327,10 +10168,7 @@ XtPointer call;
 /* bring up INDI operations panel window */
 /* ARGSUSED */
 static void
-sv_indi_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_indi_cb (Widget w, XtPointer client, XtPointer call)
 {
 	indi_manage();
 }
@@ -10338,10 +10176,7 @@ XtPointer call;
 /* callback when a Telescope history item is destroyed */
 /* ARGSUSED */
 static void
-sv_dtelpd_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_dtelpd_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPointer ud;
 
@@ -10353,10 +10188,7 @@ XtPointer call;
 /* callback to erase all telescope history */
 /* ARGSUSED */
 static void
-sv_etelpd_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_etelpd_cb (Widget w, XtPointer client, XtPointer call)
 {
 	sv_erasetelpd();
 }
@@ -10366,10 +10198,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-sv_telpd_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+sv_telpd_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Obj *op;
 
diff --git a/GUI/xephem/solsysmenu.c b/GUI/xephem/solsysmenu.c
index b40661a..36721b7 100644
--- a/GUI/xephem/solsysmenu.c
+++ b/GUI/xephem/solsysmenu.c
@@ -700,10 +700,7 @@ st_create_form()
  */
 /* ARGSUSED */
 static void
-ss_trail_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_trail_cb (Widget w, XtPointer client, XtPointer call)
 {
 	tr_setup ("xephem Solar System trails setup", "Solar System", &trstate,
 							    ss_newtrail, NULL);
@@ -713,10 +710,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ss_activate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_activate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int what = (long int) client;
 
@@ -762,10 +756,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ss_changed_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_changed_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmScaleCallbackStruct *sp = (XmScaleCallbackStruct *) call;
 
@@ -782,10 +773,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ss_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* let popdown do rest of the work */
 	XtPopdown (ssshell_w);
@@ -795,10 +783,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ss_mloop_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_mloop_cb (Widget w, XtPointer client, XtPointer call)
 {
 	ml_add (ss_pm, dt_w);
 }
@@ -806,10 +791,7 @@ XtPointer call;
 /* callback from popping down the main view */
 /* ARGSUSED */
 static void
-ss_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (stform_w);
 
@@ -831,10 +813,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ss_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_print_cb (Widget w, XtPointer client, XtPointer call)
 {
         XPSAsk ("Solar System", ss_print);
 }
@@ -1025,10 +1004,7 @@ Cardinal *n;
  */
 /* ARGSUSED */
 static void
-ss_anim_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_anim_cb (Widget w, XtPointer client, XtPointer call)
 {
 	mm_movie (MOVIE_STEPSZ);
 }
@@ -1037,10 +1013,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ss_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "This displays the solar system. The sun is always at the center. The left",
@@ -1057,10 +1030,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ss_helpon_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_helpon_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hlp_dialog ((char *)client, NULL, 0);
 }
@@ -1069,10 +1039,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ss_da_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_da_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 	Display *dsp = XtDisplay (w);
@@ -1129,10 +1096,7 @@ XtPointer call;
 
 /* ARGSUSED */
 static void
-st_parallax_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+st_parallax_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmScaleGetValue (w, &parallax);
 	ss_all ();
@@ -1186,10 +1150,7 @@ st_track_size()
 /* callback from unmapping the stereo view */
 /* ARGSUSED */
 static void
-st_unmap_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+st_unmap_cb (Widget w, XtPointer client, XtPointer call)
 {
 	stereo = 0;
 	XmToggleButtonSetState(stereo_w, False, False);
@@ -1204,10 +1165,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-st_da_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+st_da_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 	Display *dsp = XtDisplay (w);
@@ -1266,10 +1224,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ss_da_input_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_da_input_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Now *np = mm_get_now();
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
@@ -2322,10 +2277,7 @@ HLoc *hp;
  */
 /* ARGSUSED */
 static void
-ap_label_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ap_label_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Obj *op = pu.op;
 
@@ -2341,10 +2293,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ss_fav_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ss_fav_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Obj *op = pu.op;
 	if (op == db_basic(MOON))
diff --git a/GUI/xephem/srchmenu.c b/GUI/xephem/srchmenu.c
index 3256f2b..a875b31 100644
--- a/GUI/xephem/srchmenu.c
+++ b/GUI/xephem/srchmenu.c
@@ -609,10 +609,7 @@ int whether;	/* whether setting up for plotting or for not plotting */
  */
 /* ARGSUSED */
 static void
-srch_use_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+srch_use_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (srch_selecting) {
 	    if (prog_isgood()) {
@@ -627,10 +624,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-srch_newfunc_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+srch_newfunc_cb (Widget w, XtPointer client, XtPointer call)
 {
 	f_showit (err_w, "New function not compiled");
 }
@@ -640,10 +634,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-srch_loadfn_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+srch_loadfn_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char msg[1024];
 	char *g, *f, *a;
@@ -695,10 +686,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-srch_savefn_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+srch_savefn_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char buf[1024], *txt;
 	char *goal;
@@ -751,10 +739,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-srch_compile_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+srch_compile_cb (Widget w, XtPointer client, XtPointer call)
 {
 	compile_func();
 }
@@ -763,10 +748,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-srch_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+srch_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 static char *help_msg[] = {
 "This menu controls the automatic searching facility. You define an arithmetic",
@@ -790,10 +772,7 @@ static char *help_msg[] = {
  */
 /* ARGSUSED */
 static void
-srch_clear_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+srch_clear_cb (Widget w, XtPointer client, XtPointer call)
 {
 	char *txt = XmTextGetString (func_w);
 	XmTextReplace (func_w, 0, strlen(txt), "");
@@ -806,10 +785,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-srch_fields_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+srch_fields_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int whether = XmToggleButtonGetState(w);
 
@@ -823,10 +799,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-srch_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+srch_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (srchshell_w);
 }
@@ -834,10 +807,7 @@ XtPointer call;
 /* user typed Return in accuracy field. get his new value and use it */
 /* ARGSUSED */
 static void
-srch_acc_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+srch_acc_cb (Widget w, XtPointer client, XtPointer call)
 {
 	get_tmlimit();
 }
@@ -848,10 +818,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-srch_goal_cb(w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+srch_goal_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int (*sfp)()= (int (*)())client;
 
@@ -867,10 +834,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-srch_on_off_cb(w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+srch_on_off_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg =
 	    "You must first successfully compile a search Function and\n select a Goal algorithm before searching may be enabled.";
diff --git a/GUI/xephem/tips.c b/GUI/xephem/tips.c
index 4ff3132..c877f1d 100644
--- a/GUI/xephem/tips.c
+++ b/GUI/xephem/tips.c
@@ -331,10 +331,7 @@ Tip *tp;
 /* w is being destroyed so reclaim its tip info */
 /* ARGSUSED */
 static void
-tip_destroy_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+tip_destroy_cb (Widget w, XtPointer client, XtPointer call)
 {
 	tip_reclaim (w);
 }
diff --git a/GUI/xephem/trailmenu.c b/GUI/xephem/trailmenu.c
index 406bfaa..e572023 100644
--- a/GUI/xephem/trailmenu.c
+++ b/GUI/xephem/trailmenu.c
@@ -701,10 +701,7 @@ Widget savew[];
  */
 /* ARGSUSED */
 static void
-customint_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+customint_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtSetSensitive ((Widget)client, XmToggleButtonGetState(w));
 }
@@ -716,10 +713,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ok_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ok_cb (Widget w, XtPointer client, XtPointer call)
 {
 	TrContext *tcp;
 
@@ -737,10 +731,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-apply_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+apply_cb (Widget w, XtPointer client, XtPointer call)
 {
 	TrContext *tcp;
 
@@ -1076,10 +1067,7 @@ TrState *statep;
 /* called when unmapped */
 /* ARGSUSED */
 static void
-popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* N.B. don't free the userData here -- wait for destroy.
 	 * turns out unmap callbacks run before ok_cb!
@@ -1090,10 +1078,7 @@ XtPointer call;
 /* called when destroyed, client is TrContext to be free'd */
 /* ARGSUSED */
 static void
-destroy_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+destroy_cb (Widget w, XtPointer client, XtPointer call)
 {
 	free ((char *)client);
 }
@@ -1103,10 +1088,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	TrContext *tcp;
 
@@ -1119,10 +1101,7 @@ XtPointer call;
 /* called when the Help button is hit */
 /* ARGSUSED */
 static void
-help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+help_cb (Widget w, XtPointer client, XtPointer call)
 {
         hlp_dialog ("Trails", NULL, 0);
 }
diff --git a/GUI/xephem/uranusmenu.c b/GUI/xephem/uranusmenu.c
index 7acf3f5..cbd2fc6 100644
--- a/GUI/xephem/uranusmenu.c
+++ b/GUI/xephem/uranusmenu.c
@@ -906,10 +906,7 @@ int whether;	/* whether setting up for plotting or for not plotting */
 /* callback when the Close button is activated on the stats menu */
 /* ARGSUSED */
 static void
-um_sstats_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_sstats_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (usform_w);
 }
@@ -917,10 +914,7 @@ XtPointer call;
 /* callback when the More Info button is activated */
 /* ARGSUSED */
 static void
-um_sstats_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_sstats_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtManageChild (usform_w);
 	um_set_buttons(um_selecting);
@@ -930,10 +924,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-um_cpdmapping_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_cpdmapping_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtSetSensitive (tel_w, telIsOn());
 }
@@ -944,10 +935,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-um_option_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_option_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (client) {
 	    int *flagp = (int *)client;
@@ -970,10 +958,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-um_scale_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_scale_cb (Widget w, XtPointer client, XtPointer call)
 {
 	um_update (mm_get_now(), 1);
 }
@@ -982,10 +967,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-um_activate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_activate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (um_selecting) {
 	    char *name;
@@ -998,10 +980,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-ut_da_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ut_da_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static int last_nx, last_ny;
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
@@ -1111,10 +1090,7 @@ ut_track_size()
 /* callback when topview dialog is unmapped */
 /* ARGSUSED */
 static void
-ut_unmap_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+ut_unmap_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmToggleButtonSetState (topview_w, False, True);
 }
@@ -1122,10 +1098,7 @@ XtPointer call;
 /* callback when main shell is popped down */
 /* ARGSUSED */
 static void
-um_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtUnmanageChild (usform_w);
 	XtUnmanageChild (utform_w);
@@ -1152,10 +1125,7 @@ XtPointer call;
 /* callback from the main Close button */
 /* ARGSUSED */
 static void
-um_close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* let popdown do all the work */
 	XtPopdown (ushell_w);
@@ -1164,10 +1134,7 @@ XtPointer call;
 /* callback to add this scene to the movie loop */
 /* ARGSUSED */
 static void
-um_mloop_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_mloop_cb (Widget w, XtPointer client, XtPointer call)
 {
 	ml_add (um_pm, dt_w);
 }
@@ -1176,10 +1143,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-um_anim_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_anim_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* best effect if turn off worrying about the sky background */
 	skybkg = 0;
@@ -1192,10 +1156,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-um_da_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_da_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static int last_nx, last_ny;
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
@@ -1253,10 +1214,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-um_da_input_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_da_input_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 	ScreenObj *sop;
@@ -1351,10 +1309,7 @@ ScreenObj *sop;
  */
 /* ARGSUSED */
 static void
-um_help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_help_cb (Widget w, XtPointer client, XtPointer call)
 {
 	static char *msg[] = {
 "This is a simple schematic depiction of Uranus and its moons.",
@@ -1368,10 +1323,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-um_helpon_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_helpon_cb (Widget w, XtPointer client, XtPointer call)
 {
 	hlp_dialog ((char *)client, NULL, 0);
 }
@@ -1380,10 +1332,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-um_goto_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_goto_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Obj *op = db_basic (URANUS);
 	telGoto (op);
@@ -1464,10 +1413,7 @@ int x, y;
  */
 /* ARGSUSED */
 static void
-um_print_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+um_print_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XPSAsk ("Uranus", um_print);
 }
diff --git a/GUI/xephem/versionmenu.c b/GUI/xephem/versionmenu.c
index 96a180d..e588d2b 100644
--- a/GUI/xephem/versionmenu.c
+++ b/GUI/xephem/versionmenu.c
@@ -294,10 +294,7 @@ Widget w;
  */
 /* ARGSUSED */
 static void
-v_popdown_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+v_popdown_cb (Widget w, XtPointer client, XtPointer call)
 {
 	if (v_timer_id) {
 	    XtRemoveTimeOut (v_timer_id);
@@ -308,10 +305,7 @@ XtPointer call;
 /* ok */
 /* ARGSUSED */
 static void
-v_ok_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+v_ok_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XtPopdown (vshell_w);
 }
@@ -322,10 +316,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-v_da_exp_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+v_da_exp_cb (Widget w, XtPointer client, XtPointer call)
 {
 	XmDrawingAreaCallbackStruct *c = (XmDrawingAreaCallbackStruct *)call;
 
diff --git a/GUI/xephem/webdbmenu.c b/GUI/xephem/webdbmenu.c
index b4369d0..856cbc1 100644
--- a/GUI/xephem/webdbmenu.c
+++ b/GUI/xephem/webdbmenu.c
@@ -242,10 +242,7 @@ wdb_create()
 /* called from Close */
 /* ARGSUSED */
 static void
-close_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+close_cb (Widget w, XtPointer client, XtPointer call)
 {
 	/* outta here */
 	XtPopdown (wdbshell_w);
@@ -256,10 +253,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-geturl_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+geturl_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Widget tf_w = (Widget)client;
 	char *url = XmTextFieldGetString(tf_w);
@@ -275,10 +269,7 @@ XtPointer call;
  */
 /* ARGSUSED */
 static void
-getast_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+getast_cb (Widget w, XtPointer client, XtPointer call)
 {
 	AstInfo *ap = (AstInfo *)client;
 	char cmd[1024];
@@ -385,10 +376,7 @@ XtInputId *idp;
 /* called from Ok */
 /* ARGSUSED */
 static void
-help_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+help_cb (Widget w, XtPointer client, XtPointer call)
 {
         static char *msg[] = {"Download database files from the Web."};
 
diff --git a/GUI/xephem/xephem.c b/GUI/xephem/xephem.c
index 389af56..372bcd1 100644
--- a/GUI/xephem/xephem.c
+++ b/GUI/xephem/xephem.c
@@ -890,10 +890,7 @@ initialUps()
  */
 /* ARGSUSED */
 static void
-m_activate_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+m_activate_cb (Widget w, XtPointer client, XtPointer call)
 {
 	int code = (long int)client;
 
@@ -952,7 +949,7 @@ XtPointer call;
 
 /* outta here */
 static void
-goodbye()
+goodbye (void)
 {
 	XtCloseDisplay (XtDisplay (toplevel_w));
 	exit(0);
@@ -960,7 +957,7 @@ goodbye()
 
 /* user wants to quit */
 static void
-x_quit()
+x_quit (void)
 {
 	int nchg = sr_refresh();
 
diff --git a/GUI/xephem/xmisc.c b/GUI/xephem/xmisc.c
index f668929..8e3ad63 100644
--- a/GUI/xephem/xmisc.c
+++ b/GUI/xephem/xmisc.c
@@ -88,10 +88,7 @@ static int look_like_inited;
  * shouldn't use this if you have several things to set for the same widget.
  */
 void
-set_something (w, resource, value)
-Widget w;
-char *resource;
-XtArgVal value;
+set_something (Widget w, char *resource, XtArgVal value)
 {
 	Arg a[1];
 
@@ -108,10 +105,7 @@ XtArgVal value;
  * shouldn't use this if you have several things to get for the same widget.
  */
 void
-get_something (w, resource, value)
-Widget w;
-char *resource;
-XtArgVal value;
+get_something (Widget w, char *resource, XtArgVal value)
 {
 	Arg a[1];
 
@@ -130,10 +124,7 @@ XtArgVal value;
  *   XtFree (*txtp).
  */
 void
-get_xmstring (w, resource, txtp)
-Widget w;
-char *resource;
-char **txtp;
+get_xmstring (Widget w, char *resource, char **txtp)
 {
 	static char me[] = "get_xmstring()";
 	static char hah[] = "??";
@@ -157,10 +148,7 @@ char **txtp;
 }
 
 void
-set_xmstring (w, resource, txt)
-Widget w;
-char *resource;
-char *txt;
+set_xmstring (Widget w, char *resource, char *txt)
 {
 	XmString str;
 
@@ -176,8 +164,7 @@ char *txt;
 
 /* return 1 if w is on screen else 0 */
 int
-isUp (w)
-Widget w;
+isUp (Widget w)
 {
 	XWindowAttributes wa;
 	Display *dsp;
@@ -196,10 +183,7 @@ Widget w;
  */
 /* ARGSUSED */
 void
-prompt_map_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+prompt_map_cb (Widget w, XtPointer client, XtPointer call)
 {
 	Window root, child;
 	int rx, ry, wx, wy;	/* rx/y: cursor loc on root window */
@@ -240,10 +224,7 @@ XtPointer call;
  * return 0 if the color was found, -1 if White had to be used.
  */
 int
-get_color_resource (w, cname, p)
-Widget w;
-char *cname;
-Pixel *p;
+get_color_resource (Widget w, char *cname, Pixel *p)
 {
 	Display *dsp = XtDisplay(w);
 	Colormap cm;
@@ -274,9 +255,7 @@ Pixel *p;
 /* get the XFontStruct we want to use when drawing text for the display views.
  */
 void
-get_views_font (dsp, fspp)
-Display *dsp;
-XFontStruct **fspp;
+get_views_font (Display *dsp, XFontStruct **fspp)
 {
 	if (!viewsfsp)
 	    viewsfsp = getXResFont ("viewsFont");
@@ -288,9 +267,7 @@ XFontStruct **fspp;
  * this also means setting all the GCs for objects.
  */
 void
-set_views_font (dsp, fsp)
-Display *dsp;
-XFontStruct *fsp;
+set_views_font (Display *dsp, XFontStruct *fsp)
 {
 	Font fid;
 	int i;
@@ -317,9 +294,7 @@ XFontStruct *fsp;
 /* get the XFontStruct we want to use when drawing text while tracking cursor.
  */
 void
-get_tracking_font (dsp, fspp)
-Display *dsp;
-XFontStruct **fspp;
+get_tracking_font (Display *dsp, XFontStruct **fspp)
 {
 	if (!trackingfsp)
 	    trackingfsp = getXResFont ("cursorTrackingFont");
@@ -330,9 +305,7 @@ XFontStruct **fspp;
 /* set the XFontStruct we want to use when drawing text while tracking cursor.
  */
 void
-set_tracking_font (dsp, fsp)
-Display *dsp;
-XFontStruct *fsp;
+set_tracking_font (Display *dsp, XFontStruct *fsp)
 {
 	/* TODO: free old? */
 	trackingfsp = fsp;
@@ -342,7 +315,7 @@ XFontStruct *fsp;
  * TODO: reclaim old stuff if called again, but beware of hoarding users.
  */
 void
-make_objgcs()
+make_objgcs (void)
 {
 	Display *dsp = XtDisplay(toplevel_w);
 	Window win = RootWindow (dsp, DefaultScreen (dsp));
@@ -414,10 +387,7 @@ make_objgcs()
  * Use the colors defined for objects in the X resources, else White.
  */
 void
-obj_pickgc(op, w, gcp)
-Obj *op;
-Widget w;
-GC *gcp;
+obj_pickgc(Obj *op, Widget w, GC *gcp)
 {
 	/* insure GCs are ready */
 	if (!other_gc)
@@ -482,9 +452,7 @@ GC *gcp;
  * XFontStruct in its XmFontList.
  */
 void
-get_xmlabel_font (w, f)
-Widget w;
-XFontStruct **f;
+get_xmlabel_font (Widget w, XFontStruct **f)
 {
 	static char me[] = "get_xmlable_font";
 	XmFontList fl;
@@ -505,8 +473,7 @@ XFontStruct **f;
 
 /* get the font named by the given X resource, else fixed, else bust */
 XFontStruct *
-getXResFont (rn)
-char *rn;
+getXResFont (char *rn)
 {
 	static char fixed[] = "fixed";
 	char *fn = getXRes (rn, NULL);
@@ -580,10 +547,7 @@ loadGreek (Display *dsp, Drawable win, GC *greekgcp, XFontStruct **greekfspp)
  * N.B. don't change the pixels -- they are shared with other users.
  */
 int
-gray_ramp (dsp, cm, pixp)
-Display *dsp;
-Colormap cm;
-Pixel **pixp;
+gray_ramp (Display *dsp, Colormap cm, Pixel **pixp)
 {
 	static Pixel gramp[MAXGRAY];
 	static int ngray;
@@ -855,9 +819,7 @@ char why[])
  * N.B. see setXRes for how newlines are handled in the Xrm.
  */
 char *
-getXRes (name, def)
-char *name;
-char *def;
+getXRes (char *name, char *def)
 {
 	static char notfound[] = "_Not_Found_";
 	char *res = NULL;
@@ -885,8 +847,7 @@ char *def;
  *   behavior as writing to and reading back one res to an app-defaults file.
  */
 void
-setXRes (name, val)
-char *name, *val;
+setXRes (char *name, char *val)
 {
 	XrmDatabase db = XrmGetDatabase (XtDisplay(toplevel_w));
 	char buf[1024];
@@ -899,8 +860,7 @@ char *name, *val;
  * nnew is how many colors we expect to add.
  */
 Colormap
-createCM(nnew)
-int nnew;
+createCM (int nnew)
 {
 #define	NPRECM	50  /* try to preload new cm with NPRECM colors from def cm */
 	Display *dsp = XtDisplay (toplevel_w);
@@ -932,9 +892,7 @@ int nnew;
  * colors, return a new colormap or cm again.
  */
 Colormap
-checkCM(cm, nwant)
-Colormap cm;
-int nwant;
+checkCM (Colormap cm, int nwant)
 {
 	Display *dsp = XtDisplay(toplevel_w);
 	char *inst;
@@ -997,8 +955,7 @@ int nwant;
 
 /* explicitly handle pending X events when otherwise too busy */
 void
-XCheck (app)
-XtAppContext app;
+XCheck (XtAppContext app)
 {
         while ((XtAppPending (app) & XtIMXEvent) == XtIMXEvent)
 	    XtAppProcessEvent (app, XtIMXEvent);
@@ -1006,8 +963,7 @@ XtAppContext app;
 
 /* center the scrollbars in the given scrolled window */
 void
-centerScrollBars(sw_w)
-Widget sw_w;
+centerScrollBars (Widget sw_w)
 {
 	int min, max, slidersize, value;
 	XmScrollBarCallbackStruct sbcs;
@@ -1041,8 +997,7 @@ Widget sw_w;
  * full length of the current string.
  */
 void
-textColumns (w)
-Widget w;
+textColumns (Widget w)
 {
 	Arg args[10];
 	char *bp;
@@ -1069,10 +1024,7 @@ Widget w;
  * while we're at it, fix the text cursor.
  */
 void
-defaultTextFN (w, setcols,  x, y)
-Widget w;
-int setcols;
-char *x, *y;
+defaultTextFN (Widget w, int setcols, char *x, char *y)
 {
 	char *tp = XmTextGetString (w);
 
@@ -1094,10 +1046,7 @@ char *x, *y;
 
 /* turn cursor on/off to follow focus */
 static void
-textFixCursorCB(w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+textFixCursorCB (Widget w, XtPointer client, XtPointer call)
 {
 	XmAnyCallbackStruct *ap = (XmAnyCallbackStruct *)call;
 	Arg a;
@@ -1110,8 +1059,7 @@ XtPointer call;
  * TextField
  */
 void
-fixTextCursor (w)
-Widget w;
+fixTextCursor (Widget w)
 {
 	Arg a;
 
@@ -1154,7 +1102,7 @@ dateOK (Now *np, Obj *op)
 
 /* set up look_like_button[] and look_like_label[] */
 void
-setButtonInfo()
+setButtonInfo (void)
 {
 	Pixel topshadcol, botshadcol, bgcol;
 	Pixmap topshadpm, botshadpm;
@@ -1189,9 +1137,7 @@ setButtonInfo()
  * or like a label.
  */
 void
-buttonAsButton (w, whether)
-Widget w;
-int whether;
+buttonAsButton (Widget w, int whether)
 {
 	if (!look_like_inited) {
 	    setButtonInfo();
@@ -1208,7 +1154,7 @@ int whether;
  * then check occasionally using stopd_check()
  */
 void
-stopd_up()
+stopd_up (void)
 {
 	/* create if first time */
 	if (!stopd_w) {
@@ -1267,7 +1213,7 @@ stopd_up()
 
 /* bring down the user-stop dialog */
 void
-stopd_down()
+stopd_down (void)
 {
 	if (stopd_w)
 	    XtPopdown (stopd_w);
@@ -1278,7 +1224,7 @@ stopd_down()
  * return -1 to stop, else 0.
  */
 int
-stopd_check()
+stopd_check (void)
 {
 	/* check for user button presses */
 	XCheck (xe_app);
@@ -1293,10 +1239,7 @@ stopd_check()
 /* called when the user presses the Stop button */
 /* ARGSUSED */
 static void
-stopd_cb (w, client, call)
-Widget w;
-XtPointer client;
-XtPointer call;
+stopd_cb (Widget w, XtPointer client, XtPointer call)
 {
 	xe_msg (0, "User stop");
 	stopd_stopped = 1;