diff --git a/src/engine/fileunix.c b/src/engine/fileunix.c
index 8cd6abaa6..95affd603 100644
--- a/src/engine/fileunix.c
+++ b/src/engine/fileunix.c
@@ -85,7 +85,7 @@ struct ar_hdr  /* archive file member header - printable ascii */
 
 #ifndef HAVE_AR
 # ifdef OS_AIX
-/* Define those for AIX to get the definitions for both small and big archive
+/* Define these for AIX to get the definitions for both small and big archive
  * file format variants.
  */
 #  define __AR_SMALL__
diff --git a/src/engine/make.h b/src/engine/make.h
index d49335aa0..882ccebd7 100644
--- a/src/engine/make.h
+++ b/src/engine/make.h
@@ -35,7 +35,7 @@ void make0( TARGET * t, TARGET * p, int depth, COUNTS * counts, int anyhow,
 /* Specifies that the target should be updated. */
 void mark_target_for_updating( OBJECT * target );
 
-/* Returns targets previously passed to 'mark_target_for_updating'. */
+/* Returns targets previously passed to mark_target_for_updating(). */
 LIST * targets_to_update();
 
 /* Clears/unmarks all targets currently marked for update. */
diff --git a/src/engine/make1.c b/src/engine/make1.c
index 6f2036a17..d1732db12 100644
--- a/src/engine/make1.c
+++ b/src/engine/make1.c
@@ -820,6 +820,8 @@ static void make1c_closure
     char const * rule_name = 0;
     char const * target_name = 0;
 
+    assert( cmd );
+
     --cmdsrunning;
 
     /* Calculate the target's status from the cmd execution result. */
@@ -843,7 +845,6 @@ static void make1c_closure
             t->status = EXEC_CMD_OK;
     }
 
-    assert( cmd );
     if ( DEBUG_MAKEQ ||
         ( DEBUG_MAKE && !( cmd->rule->actions->flags & RULE_QUIETLY ) ) )
     {
@@ -1192,7 +1193,7 @@ static SETTINGS * make1settings( struct module_t * module, LIST * vars )
     LISTITER const vars_end = list_end( vars );
     for ( ; vars_iter != vars_end; vars_iter = list_next( vars_iter ) )
     {
-        LIST * l = var_get( module, list_item( vars_iter ) );
+        LIST * const l = var_get( module, list_item( vars_iter ) );
         LIST * nl = L0;
         LISTITER iter = list_begin( l );
         LISTITER const end = list_end( l );