Fixing mistakes from previous checkin.stable_after_mergeLIBGTOP_STABLE_0_20

18 files changed, 237 insertions, 297 deletions

diff --git a/sysdeps/guile/names/cpu.c b/sysdeps/guile/names/cpu.c
index 94cb4056..e7b533b6 100644
--- a/sysdeps/guile/names/cpu.c
+++ b/sysdeps/guile/names/cpu.c
@@ -34,10 +34,9 @@ glibtop_guile_names_cpu (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_names_cpu [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_names_cpu [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -52,10 +51,9 @@ glibtop_guile_types_cpu (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_types_cpu [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_types_cpu [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -70,11 +68,10 @@ glibtop_guile_labels_cpu (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_labels_cpu [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_labels_cpu [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -89,11 +86,10 @@ glibtop_guile_descriptions_cpu (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_descriptions_cpu [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_descriptions_cpu [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/loadavg.c b/sysdeps/guile/names/loadavg.c
index c12254b4..e82c8e9b 100644
--- a/sysdeps/guile/names/loadavg.c
+++ b/sysdeps/guile/names/loadavg.c
@@ -34,10 +34,9 @@ glibtop_guile_names_loadavg (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_names_loadavg [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_names_loadavg [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -52,10 +51,9 @@ glibtop_guile_types_loadavg (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_types_loadavg [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_types_loadavg [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -70,11 +68,10 @@ glibtop_guile_labels_loadavg (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_labels_loadavg [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_labels_loadavg [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -89,11 +86,10 @@ glibtop_guile_descriptions_loadavg (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_descriptions_loadavg [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_descriptions_loadavg [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/mem.c b/sysdeps/guile/names/mem.c
index fe2582e5..53662e1e 100644
--- a/sysdeps/guile/names/mem.c
+++ b/sysdeps/guile/names/mem.c
@@ -34,10 +34,9 @@ glibtop_guile_names_mem (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_names_mem [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_names_mem [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -52,10 +51,9 @@ glibtop_guile_types_mem (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_types_mem [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_types_mem [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -70,11 +68,10 @@ glibtop_guile_labels_mem (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_labels_mem [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_labels_mem [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -89,11 +86,10 @@ glibtop_guile_descriptions_mem (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_descriptions_mem [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_descriptions_mem [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/msg_limits.c b/sysdeps/guile/names/msg_limits.c
index 4e7afc4f..60b23ee7 100644
--- a/sysdeps/guile/names/msg_limits.c
+++ b/sysdeps/guile/names/msg_limits.c
@@ -34,10 +34,9 @@ glibtop_guile_names_msg_limits (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_names_msg_limits [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_names_msg_limits [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -52,10 +51,9 @@ glibtop_guile_types_msg_limits (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_types_msg_limits [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_types_msg_limits [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -70,11 +68,10 @@ glibtop_guile_labels_msg_limits (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_labels_msg_limits [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_labels_msg_limits [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -89,11 +86,10 @@ glibtop_guile_descriptions_msg_limits (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_descriptions_msg_limits [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_descriptions_msg_limits [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/prockernel.c b/sysdeps/guile/names/prockernel.c
index 31e7b13b..436e6d23 100644
--- a/sysdeps/guile/names/prockernel.c
+++ b/sysdeps/guile/names/prockernel.c
@@ -34,10 +34,9 @@ glibtop_guile_names_proc_kernel (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_names_proc_kernel [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_names_proc_kernel [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -52,10 +51,9 @@ glibtop_guile_types_proc_kernel (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_types_proc_kernel [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_types_proc_kernel [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -70,11 +68,10 @@ glibtop_guile_labels_proc_kernel (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_labels_proc_kernel [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_labels_proc_kernel [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -89,11 +86,10 @@ glibtop_guile_descriptions_proc_kernel (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_descriptions_proc_kernel [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_descriptions_proc_kernel [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/proclist.c b/sysdeps/guile/names/proclist.c
index fb129e97..764483b3 100644
--- a/sysdeps/guile/names/proclist.c
+++ b/sysdeps/guile/names/proclist.c
@@ -35,10 +35,9 @@ glibtop_guile_names_proclist (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_names_proclist [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_names_proclist [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -53,11 +52,10 @@ glibtop_guile_types_proclist (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_types_proclist [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
-	
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_types_proclist [i])),
+				  SCM_UNDEFINED));
+			 
 	return list;
 }
 
@@ -71,11 +69,10 @@ glibtop_guile_labels_proclist (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_labels_proclist [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_labels_proclist [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -90,11 +87,10 @@ glibtop_guile_descriptions_proclist (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_descriptions_proclist [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_descriptions_proclist [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/procmem.c b/sysdeps/guile/names/procmem.c
index 58101900..cbd58a19 100644
--- a/sysdeps/guile/names/procmem.c
+++ b/sysdeps/guile/names/procmem.c
@@ -34,10 +34,9 @@ glibtop_guile_names_proc_mem (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_names_proc_mem [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_names_proc_mem [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -52,10 +51,9 @@ glibtop_guile_types_proc_mem (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_types_proc_mem [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_types_proc_mem [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -70,11 +68,10 @@ glibtop_guile_labels_proc_mem (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_labels_proc_mem [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_labels_proc_mem [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -89,11 +86,10 @@ glibtop_guile_descriptions_proc_mem (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_descriptions_proc_mem [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_descriptions_proc_mem [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/procsegment.c b/sysdeps/guile/names/procsegment.c
index 5ab51c56..a872bcd1 100644
--- a/sysdeps/guile/names/procsegment.c
+++ b/sysdeps/guile/names/procsegment.c
@@ -34,10 +34,9 @@ glibtop_guile_names_proc_segment (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_names_proc_segment [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_names_proc_segment [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -52,10 +51,9 @@ glibtop_guile_types_proc_segment (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_types_proc_segment [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_types_proc_segment [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -70,11 +68,10 @@ glibtop_guile_labels_proc_segment (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_labels_proc_segment [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_labels_proc_segment [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -89,11 +86,10 @@ glibtop_guile_descriptions_proc_segment (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_descriptions_proc_segment [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_descriptions_proc_segment [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/procsignal.c b/sysdeps/guile/names/procsignal.c
index f614992d..18c16271 100644
--- a/sysdeps/guile/names/procsignal.c
+++ b/sysdeps/guile/names/procsignal.c
@@ -34,10 +34,9 @@ glibtop_guile_names_proc_signal (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_names_proc_signal [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_names_proc_signal [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -52,10 +51,9 @@ glibtop_guile_types_proc_signal (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_types_proc_signal [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_types_proc_signal [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -70,11 +68,10 @@ glibtop_guile_labels_proc_signal (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_labels_proc_signal [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_labels_proc_signal [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -89,11 +86,10 @@ glibtop_guile_descriptions_proc_signal (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_descriptions_proc_signal [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_descriptions_proc_signal [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/procstate.c b/sysdeps/guile/names/procstate.c
index 9b1a1e16..ca10c102 100644
--- a/sysdeps/guile/names/procstate.c
+++ b/sysdeps/guile/names/procstate.c
@@ -34,10 +34,9 @@ glibtop_guile_names_proc_state (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_names_proc_state [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_names_proc_state [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -52,10 +51,9 @@ glibtop_guile_types_proc_state (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_types_proc_state [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_types_proc_state [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -70,11 +68,10 @@ glibtop_guile_labels_proc_state (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_labels_proc_state [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_labels_proc_state [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -89,11 +86,10 @@ glibtop_guile_descriptions_proc_state (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_descriptions_proc_state [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_descriptions_proc_state [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/proctime.c b/sysdeps/guile/names/proctime.c
index fb0d194c..4797d4ab 100644
--- a/sysdeps/guile/names/proctime.c
+++ b/sysdeps/guile/names/proctime.c
@@ -34,10 +34,9 @@ glibtop_guile_names_proc_time (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_names_proc_time [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_names_proc_time [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -51,11 +50,10 @@ glibtop_guile_types_proc_time (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
-		list = gh_appen
-			(list, gh_list
-			 (gh_str02scm (glibtop_types_proc_time [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+		list = gh_append
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_types_proc_time [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -69,12 +67,11 @@ glibtop_guile_labels_proc_time (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
-		list = gh_appen
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_labels_proc_time [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+		list = gh_append
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_labels_proc_time [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -88,12 +85,11 @@ glibtop_guile_descriptions_proc_time (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
-		list = gh_appen
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_descriptions_proc_time [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+		list = gh_append
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_descriptions_proc_time [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/procuid.c b/sysdeps/guile/names/procuid.c
index 32170788..96022765 100644
--- a/sysdeps/guile/names/procuid.c
+++ b/sysdeps/guile/names/procuid.c
@@ -34,10 +34,9 @@ glibtop_guile_names_proc_uid (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_names_proc_uid [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_names_proc_uid [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -52,10 +51,9 @@ glibtop_guile_types_proc_uid (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (glibtop_types_proc_uid [i]),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (glibtop_types_proc_uid [i])),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -70,11 +68,10 @@ glibtop_guile_labels_proc_uid (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_labels_proc_uid [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_labels_proc_uid [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
@@ -89,11 +86,10 @@ glibtop_guile_descriptions_proc_uid (void)
 	
 	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
 		list = gh_append
-			(list, gh_list
-			 (gh_str02scm (gettext
-				       (glibtop_descriptions_proc_uid [i])),
-			  SCM_UNDEFINED),
-			 SCM_UNDEFINED);
+			(gh_list (list,
+				  gh_list (gh_str02scm (gettext
+							(glibtop_descriptions_proc_uid [i]))),
+				  SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/sem_limits.c b/sysdeps/guile/names/sem_limits.c
index 46bdeb94..23b7a252 100644
--- a/sysdeps/guile/names/sem_limits.c
+++ b/sysdeps/guile/names/sem_limits.c
@@ -33,10 +33,9 @@ glibtop_guile_names_sem_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (glibtop_names_sem_limits [i]),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (glibtop_names_sem_limits [i])),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -50,10 +49,9 @@ glibtop_guile_types_sem_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (gettext (glibtop_types_sem_limits [i])),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_types_sem_limits [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -67,10 +65,9 @@ glibtop_guile_labels_sem_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (gettext (glibtop_labels_sem_limits [i])),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_labels_sem_limits [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -84,10 +81,9 @@ glibtop_guile_descriptions_sem_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (gettext (glibtop_descriptions_sem_limits [i])),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_descriptions_sem_limits [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/shm_limits.c b/sysdeps/guile/names/shm_limits.c
index 6987ad5d..c81a1b42 100644
--- a/sysdeps/guile/names/shm_limits.c
+++ b/sysdeps/guile/names/shm_limits.c
@@ -33,10 +33,9 @@ glibtop_guile_names_shm_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (glibtop_names_shm_limits [i]),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (glibtop_names_shm_limits [i])),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -50,10 +49,9 @@ glibtop_guile_types_shm_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (gettext (glibtop_types_shm_limits [i])),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_types_shm_limits [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -67,10 +65,9 @@ glibtop_guile_labels_shm_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (gettext (glibtop_labels_shm_limits [i])),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_labels_shm_limits [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -84,10 +81,9 @@ glibtop_guile_descriptions_shm_limits (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (gettext (glibtop_descriptions_shm_limits [i])),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_descriptions_shm_limits [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/swap.c b/sysdeps/guile/names/swap.c
index 7e04d533..21195a8f 100644
--- a/sysdeps/guile/names/swap.c
+++ b/sysdeps/guile/names/swap.c
@@ -33,10 +33,9 @@ glibtop_guile_names_swap (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (glibtop_names_swap [i]),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (glibtop_names_swap [i])),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -50,10 +49,9 @@ glibtop_guile_types_swap (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (gettext (glibtop_types_swap [i])),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_types_swap [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -67,10 +65,9 @@ glibtop_guile_labels_swap (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (gettext (glibtop_labels_swap [i])),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_labels_swap [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -84,10 +81,9 @@ glibtop_guile_descriptions_swap (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (gettext (glibtop_descriptions_swap [i])),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_descriptions_swap [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/sysdeps.c b/sysdeps/guile/names/sysdeps.c
index 20e4c184..390be91f 100644
--- a/sysdeps/guile/names/sysdeps.c
+++ b/sysdeps/guile/names/sysdeps.c
@@ -33,9 +33,10 @@ glibtop_guile_names_sysdeps (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SYSDEPS; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (glibtop_names_sysdeps [i]),
-						  SCM_UNDEFINED));
-	
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (glibtop_names_sysdeps [i])),
+					   SCM_UNDEFINED));
+				   
 	return list;
 }
 
@@ -48,8 +49,9 @@ glibtop_guile_types_sysdeps (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SYSDEPS; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_types_sysdeps [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_types_sysdeps [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -63,8 +65,9 @@ glibtop_guile_labels_sysdeps (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SYSDEPS; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_labels_sysdeps [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_labels_sysdeps [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -78,8 +81,9 @@ glibtop_guile_descriptions_sysdeps (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_SYSDEPS; i++)
-		list = gh_append2 (list, gh_list (gh_str02scm (gettext (glibtop_descriptions_sysdeps [i])),
-						  SCM_UNDEFINED));
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_descriptions_sysdeps [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/names/uptime.c b/sysdeps/guile/names/uptime.c
index a5d6a2bf..3776363b 100644
--- a/sysdeps/guile/names/uptime.c
+++ b/sysdeps/guile/names/uptime.c
@@ -33,10 +33,9 @@ glibtop_guile_names_uptime (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (glibtop_names_uptime [i]),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (glibtop_names_uptime [i])),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -50,10 +49,9 @@ glibtop_guile_types_uptime (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (gettext (glibtop_types_uptime [i])),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_types_uptime [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -67,10 +65,9 @@ glibtop_guile_labels_uptime (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (gettext (glibtop_labels_uptime [i])),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_labels_uptime [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
@@ -84,10 +81,9 @@ glibtop_guile_descriptions_uptime (void)
 	list = gh_list (SCM_UNDEFINED);
 	
 	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
-		list = gh_append (list, gh_list
-				  (gh_str02scm (gettext (glibtop_descriptions_uptime [i])),
-				   SCM_UNDEFINED),
-				  SCM_UNDEFINED);
+		list = gh_append (gh_list (list,
+					   gh_list (gh_str02scm (gettext (glibtop_descriptions_uptime [i]))),
+					   SCM_UNDEFINED));
 	
 	return list;
 }
diff --git a/sysdeps/guile/proclist.c b/sysdeps/guile/proclist.c
index 6eea127b..7491805f 100644
--- a/sysdeps/guile/proclist.c
+++ b/sysdeps/guile/proclist.c
@@ -43,10 +43,10 @@ glibtop_guile_get_proclist (void)
 
 	if (ptr) {
 		for (i = 0; i < proclist.number; i++)
-			list = gh_append (list,
-					  gh_list (gh_ulong2scm ((unsigned long) ptr [i]),
-						   SCM_UNDEFINED),
-					  SCM_UNDEFINED);
+			list = gh_append
+				(gh_list (list,
+					  gh_list (gh_ulong2scm ((unsigned long) ptr [i])),
+					  SCM_UNDEFINED));
 	}
 
 	glibtop_free (ptr);