diff --git a/src/cc65/expr.c b/src/cc65/expr.c
index ae185f7b5..9dd6afe8d 100644
--- a/src/cc65/expr.c
+++ b/src/cc65/expr.c
@@ -1104,7 +1104,7 @@ static void StructRef (ExprDesc* Expr)
     }
 
     /* Make the expression a bit field if necessary */
-    if ((Field->Flags & SC_BITFIELD) == SC_BITFIELD) {
+    if (SymIsBitField (Field)) {
         ED_MakeBitField (Expr, Field->V.B.BitOffs, Field->V.B.BitWidth);
     }
 }
diff --git a/src/cc65/symtab.c b/src/cc65/symtab.c
index 6ab25d374..4e4ebbc82 100644
--- a/src/cc65/symtab.c
+++ b/src/cc65/symtab.c
@@ -156,7 +156,7 @@ static void CheckSymTable (SymTable* Tab)
      	unsigned Flags = Entry->Flags;
 
 	/* Ignore typedef entries */
-	if ((Flags & SC_TYPEDEF) != SC_TYPEDEF) {
+	if (!SymIsTypeDef (Entry)) {
 
 	    /* Check if the symbol is one with storage, and it if it was
 	     * defined but not used.