diff --git a/ChangeLog b/ChangeLog
index a0d180f60..ff6a8c6fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-09  Robert Millan  <rmh.grub@aybabtu.com>
+
+	Misc cleanup.
+
+	* kern/command.c (grub_register_command_prio): Use
+	grub_zalloc() instead of explicitly zeroing data.
+	* kern/list.c: Include `<grub/mm.h>'.
+	(grub_named_list_find): Replace `0' with `NULL'.
+	* normal/autofs.c (struct grub_fs_module_list): Remove ad-hoc type.
+	(fs_module_list): Change type to `grub_named_list_t'.  Update all
+	users.
+	* normal/dyncmd.c (read_command_list): Add space between function
+	call and parenthesis.
+	* normal/handler.c (read_handler_list): Likewise.
+
 2009-11-09  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* normal/auth.c (punishment_delay): Moved from here ...
diff --git a/kern/command.c b/kern/command.c
index 63b536eb7..9b3c92b9b 100644
--- a/kern/command.c
+++ b/kern/command.c
@@ -31,7 +31,7 @@ grub_register_command_prio (const char *name,
 {
   grub_command_t cmd;
 
-  cmd = (grub_command_t) grub_malloc (sizeof (*cmd));
+  cmd = (grub_command_t) grub_zalloc (sizeof (*cmd));
   if (! cmd)
     return 0;
 
@@ -42,7 +42,6 @@ grub_register_command_prio (const char *name,
 
   cmd->flags = GRUB_COMMAND_FLAG_BOTH;
   cmd->prio = prio;
-  cmd->data = 0;
 
   grub_prio_list_insert (GRUB_AS_PRIO_LIST_P (&grub_command_list),
 			 GRUB_AS_PRIO_LIST (cmd));
diff --git a/kern/list.c b/kern/list.c
index b879f1320..379b0d886 100644
--- a/kern/list.c
+++ b/kern/list.c
@@ -19,6 +19,7 @@
 
 #include <grub/list.h>
 #include <grub/misc.h>
+#include <grub/mm.h>
 
 void
 grub_list_push (grub_list_t *head, grub_list_t item)
@@ -81,7 +82,7 @@ grub_list_insert (grub_list_t *head, grub_list_t item,
 void *
 grub_named_list_find (grub_named_list_t head, const char *name)
 {
-  grub_named_list_t result = 0;
+  grub_named_list_t result = NULL;
 
   auto int list_find (grub_named_list_t item);
   int list_find (grub_named_list_t item)
diff --git a/normal/autofs.c b/normal/autofs.c
index 39f2f9ddc..ce354a22c 100644
--- a/normal/autofs.c
+++ b/normal/autofs.c
@@ -25,22 +25,15 @@
 #include <grub/normal.h>
 
 /* This is used to store the names of filesystem modules for auto-loading.  */
-struct grub_fs_module_list
-{
-  char *name;
-  struct grub_fs_module_list *next;
-};
-typedef struct grub_fs_module_list *grub_fs_module_list_t;
-
-static grub_fs_module_list_t fs_module_list = 0;
+static grub_named_list_t fs_module_list;
 
 /* The auto-loading hook for filesystems.  */
 static int
 autoload_fs_module (void)
 {
-  grub_fs_module_list_t p;
+  grub_named_list_t p;
 
-  while ((p = fs_module_list) != 0)
+  while ((p = fs_module_list) != NULL)
     {
       if (! grub_dl_get (p->name) && grub_dl_load (p->name))
 	return 1;
@@ -84,7 +77,7 @@ read_fs_list (void)
 		  char *buf;
 		  char *p;
 		  char *q;
-		  grub_fs_module_list_t fs_mod;
+		  grub_named_list_t fs_mod;
 
 		  buf = grub_file_getline (file);
 		  if (! buf)
diff --git a/normal/dyncmd.c b/normal/dyncmd.c
index 154da6114..84b7ff3b1 100644
--- a/normal/dyncmd.c
+++ b/normal/dyncmd.c
@@ -84,7 +84,7 @@ read_command_list (void)
 	  if (file)
 	    {
 	      char *buf = 0;
-	      for (;; grub_free(buf))
+	      for (;; grub_free (buf))
 		{
 		  char *p, *name, *modname;
 		  grub_command_t cmd;
diff --git a/normal/handler.c b/normal/handler.c
index fe31478fe..5e9f8612c 100644
--- a/normal/handler.c
+++ b/normal/handler.c
@@ -182,7 +182,7 @@ read_handler_list (void)
 	  if (file)
 	    {
 	      char *buf = 0;
-	      for (;; grub_free(buf))
+	      for (;; grub_free (buf))
 		{
 		  char *p;