diff --git a/ChangeLog b/ChangeLog
index 5d2748938..84ae8fa89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-08-30  Werner Lemberg  <wl@gnu.org>
+
+	[autofit] Code clean-up.
+
+	* src/autofit/afglobal.h (AF_STYLE_MASK): New macro.
+	(AF_STYLE_UNASSIGNED): Use AF_STYLE_MASK for definition.
+
+	* src/autofit/afglobal.c (af_face_globals_compute_style_coverage):
+	Updated.
+
 2015-08-30  Werner Lemberg  <wl@gnu.org>
 
 	[autofit] Make glyph style array use 16bit values.
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index d90837086..cd0e2abff 100644
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -249,9 +249,9 @@
 
       for ( nn = 0; nn < globals->glyph_count; nn++ )
       {
-        if ( ( gstyles[nn] & ~AF_DIGIT ) == AF_STYLE_UNASSIGNED )
+        if ( ( gstyles[nn] & AF_STYLE_MASK ) == AF_STYLE_UNASSIGNED )
         {
-          gstyles[nn] &= ~AF_STYLE_UNASSIGNED;
+          gstyles[nn] &= ~AF_STYLE_MASK;
           gstyles[nn] |= globals->module->fallback_style;
         }
       }
@@ -275,7 +275,7 @@
 
       for ( idx = 0; idx < globals->glyph_count; idx++ )
       {
-        if ( ( gstyles[idx] & ~AF_DIGIT ) == style_class->style )
+        if ( ( gstyles[idx] & AF_STYLE_MASK ) == style_class->style )
         {
           if ( !( count % 10 ) )
             FT_TRACE4(( " " ));
diff --git a/src/autofit/afglobal.h b/src/autofit/afglobal.h
index 6cacd6961..284f6a037 100644
--- a/src/autofit/afglobal.h
+++ b/src/autofit/afglobal.h
@@ -72,8 +72,12 @@ FT_BEGIN_HEADER
 #endif
   /* default script for OpenType; ignored if HarfBuzz isn't used */
 #define AF_SCRIPT_DEFAULT    AF_SCRIPT_LATN
-  /* a bit mask indicating an uncovered glyph        */
-#define AF_STYLE_UNASSIGNED  0x7FFF
+
+  /* a bit mask for TA_DIGIT */
+#define AF_STYLE_MASK        0x7FFF
+  /* an uncovered glyph      */
+#define AF_STYLE_UNASSIGNED  AF_STYLE_MASK
+
   /* if this flag is set, we have an ASCII digit     */
 #define AF_DIGIT             0x8000U