diff --git a/ChangeLog b/ChangeLog
index fb8d5b938..00a144de9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,25 +1,24 @@
 2008-08-18  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
 
-	* src/base/ftmac.c: Add a fallback to suppose the availability
-	of ResourceIndex type. It is used when built without configure
-	(e.g. build by Jam).
+	* src/base/ftmac.c: Add a fallback to guess the availability of the
+	`ResourceIndex' type.  It is used when built without configure
+	(e.g., a build with Jam).
 	* builds/mac/ftmac.c: Ditto.
-	* builds/unix/configure.raw: Set HAVE_TYPE_RESOURCE_INDEX
-	to 1 or 0 explicitly, even if ResourceIndex is unavailable.
+	* builds/unix/configure.raw: Set HAVE_TYPE_RESOURCE_INDEX to 1 or 0
+	explicitly, even if `ResourceIndex' is unavailable.
 
 2008-08-18  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
 
 	* builds/unix/configure.raw: In checking of Mac OS X features,
-	all-in-one header file "Carbon.h" is replaced by by the minimum
-	header file "CoreServices.h", as current src/base/ftmac.c.
+	all-in-one header file `Carbon.h' is replaced by the minimum
+	header file `CoreServices.h', similar to current src/base/ftmac.c.
 
 2008-08-18  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
 
 	* src/sfnt/ttcmap.c (tt_cmap2_validate): Skip the validation of
-	sub-header when its code_count is 0. Many Japanese Dynalab fonts
-	include such empty sub-header (code_count == 0, first_code == 0
-	delta == 0, but offset != 0 ) as the second sub-header in SJIS
-	cmap.
+	sub-header when its code_count is 0.  Many Japanese Dynalab fonts
+	include such an empty sub-header (code_count == 0, first_code == 0
+	delta == 0, but offset != 0) as the second sub-header in SJIS cmap.
 
 2008-08-04  Werner Lemberg  <wl@gnu.org>
 
diff --git a/builds/mac/ftmac.c b/builds/mac/ftmac.c
index 8b4d29560..ef45dca90 100644
--- a/builds/mac/ftmac.c
+++ b/builds/mac/ftmac.c
@@ -145,18 +145,18 @@
 #endif
 #endif
 
-  /* configure checks the availability of ResourceIndex strictly */
-  /* and set HAVE_TYPE_RESOURCE_INDEX 1 or 0 always. If it is    */
-  /* not set (e.g. build without configure), the availability    */
-  /* is supposed from the SDK version but this is uncertain.     */
-#if !defined( HAVE_TYPE_RESOURCE_INDEX )
+  /* `configure' checks the availability of `ResourceIndex' strictly */
+  /* and sets HAVE_TYPE_RESOURCE_INDEX to 1 or 0 always.  If it is   */
+  /* not set (e.g., a build without `configure'), the availability   */
+  /* is guessed from the SDK version.                                */
+#ifndef HAVE_TYPE_RESOURCE_INDEX
 #if !defined( MAC_OS_X_VERSION_10_5 ) || \
-#   ( MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 )
+    ( MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 )
 #define HAVE_TYPE_RESOURCE_INDEX 0
 #else
 #define HAVE_TYPE_RESOURCE_INDEX 1
 #endif
-#endif
+#endif /* !HAVE_TYPE_RESOURCE_INDEX */
 
 #if ( HAVE_TYPE_RESOURCE_INDEX == 0 )
 typedef short ResourceIndex;
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index ab6739123..a799817b7 100644
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -77,21 +77,21 @@
 #define OS_INLINE  static __inline__
 #endif
 
-  /* configure checks the availability of ResourceIndex strictly */
-  /* and set HAVE_TYPE_RESOURCE_INDEX 1 or 0 always. If it is    */
-  /* not set (e.g. build without configure), the availability    */
-  /* is supposed from the SDK version but this is uncertain.     */
-#if !defined( HAVE_TYPE_RESOURCE_INDEX )
+  /* `configure' checks the availability of `ResourceIndex' strictly */
+  /* and sets HAVE_TYPE_RESOURCE_INDEX 1 or 0 always.  If it is      */
+  /* not set (e.g., a build without `configure'), the availability   */
+  /* is guessed from the SDK version.                                */
+#ifndef HAVE_TYPE_RESOURCE_INDEX
 #if !defined( MAC_OS_X_VERSION_10_5 ) || \
-#   ( MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 )
+    ( MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 )
 #define HAVE_TYPE_RESOURCE_INDEX 0
 #else
 #define HAVE_TYPE_RESOURCE_INDEX 1
 #endif
-#endif
+#endif /* !HAVE_TYPE_RESOURCE_INDEX */
 
 #if ( HAVE_TYPE_RESOURCE_INDEX == 0 )
-typedef short ResourceIndex;
+  typedef short  ResourceIndex;
 #endif
 
 #include <CoreServices/CoreServices.h>
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index 1b5cf69c2..f07891d10 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -328,8 +328,8 @@
       delta      = TT_NEXT_SHORT( p );
       offset     = TT_NEXT_USHORT( p );
 
-      /* many Dynalab fonts have empty sub-header */
-      if ( 0 == code_count )
+      /* many Dynalab fonts have empty sub-headers */
+      if ( code_count == 0 )
         continue;
 
       /* check range within 0..255 */