diff --git a/src/cc65/codeinfo.c b/src/cc65/codeinfo.c
index 427bfc52b..435794613 100644
--- a/src/cc65/codeinfo.c
+++ b/src/cc65/codeinfo.c
@@ -560,11 +560,8 @@ fncls_t GetFuncInfo (const char* Name, unsigned int* Use, unsigned int* Chg)
                 *Use = REG_NONE;
             }
 
-            /* Will destroy all registers */
-            *Chg = REG_ALL;
-
-            /* and will destroy all processor flags */
-            *Chg |= PSTATE_ALL;
+            /* Will destroy all registers and processor flags */
+            *Chg = (REG_ALL | PSTATE_ALL);
 
             /* Done */
             return FNCLS_GLOBAL;
@@ -577,8 +574,7 @@ fncls_t GetFuncInfo (const char* Name, unsigned int* Use, unsigned int* Chg)
         ** are used mostly in inline assembly anyway.
         */
         *Use = REG_ALL;
-        *Chg = REG_ALL;
-        *Chg |= PSTATE_ALL;
+        *Chg = (REG_ALL | PSTATE_ALL);
         return FNCLS_NUMERIC;
 
     } else {
@@ -605,8 +601,7 @@ fncls_t GetFuncInfo (const char* Name, unsigned int* Use, unsigned int* Chg)
                 fprintf (stderr, "No info about internal function '%s'\n", Name);
             }
             *Use = REG_ALL;
-            *Chg = REG_ALL;
-            *Chg |= PSTATE_ALL;
+            *Chg = (REG_ALL | PSTATE_ALL);
         }
         return FNCLS_BUILTIN;
     }
@@ -615,8 +610,7 @@ fncls_t GetFuncInfo (const char* Name, unsigned int* Use, unsigned int* Chg)
     ** registers and processor flags are changed
     */
     *Use = REG_EAXY;
-    *Chg = REG_ALL;
-    *Chg |= PSTATE_ALL;
+    *Chg = (REG_ALL | PSTATE_ALL);
 
     return FNCLS_UNKNOWN;
 }
@@ -899,6 +893,14 @@ int RegEAXUsed (struct CodeSeg* S, unsigned Index)
 
 
 
+int LoadFlagsUsed (struct CodeSeg* S, unsigned Index)
+/* Check if one of the flags set by a register load (Z and N) are used. */
+{
+    return (GetRegInfo (S, Index, PSTATE_ZN) & PSTATE_ZN) != 0;
+}
+
+
+
 unsigned GetKnownReg (unsigned Use, const RegContents* RC)
 /* Return the register or zero page location from the set in Use, thats
 ** contents are known. If Use does not contain any register, or if the
diff --git a/src/cc65/codeinfo.h b/src/cc65/codeinfo.h
index 14ef54d8f..c57908dad 100644
--- a/src/cc65/codeinfo.h
+++ b/src/cc65/codeinfo.h
@@ -201,6 +201,9 @@ int RegAXUsed (struct CodeSeg* S, unsigned Index);
 int RegEAXUsed (struct CodeSeg* S, unsigned Index);
 /* Check if any of the four bytes in EAX are used. */
 
+int LoadFlagsUsed (struct CodeSeg* S, unsigned Index);
+/* Check if one of the flags set by a register load (Z and N) are used. */
+
 unsigned GetKnownReg (unsigned Use, const struct RegContents* RC);
 /* Return the register or zero page location from the set in Use, thats
 ** contents are known. If Use does not contain any register, or if the
diff --git a/src/cc65/coptind.c b/src/cc65/coptind.c
index 49855a345..52c47481e 100644
--- a/src/cc65/coptind.c
+++ b/src/cc65/coptind.c
@@ -151,8 +151,8 @@ static short ZPRegVal (unsigned short Use, const RegContents* RC)
 
 
 unsigned OptUnusedLoads (CodeSeg* S)
-/* Remove loads of or operations with registers where the value loaded or 
-** produced is not used later. 
+/* Remove loads of or operations with registers where the value loaded or
+** produced is not used later.
 */
 {
     unsigned Changes = 0;
@@ -173,7 +173,7 @@ unsigned OptUnusedLoads (CodeSeg* S)
                    E->OPC == OP65_ORA;
 
         /* Check for the necessary preconditions */
-        if (IsOp && (N = CS_GetNextEntry (S, I)) != 0 && !CE_UseLoadFlags (N)) {
+        if (IsOp && (N = CS_GetNextEntry (S, I)) != 0 && !LoadFlagsUsed (S, I+1)) {
 
             /* Check which sort of load or transfer it is */
             unsigned R;
diff --git a/src/cc65/coptmisc.c b/src/cc65/coptmisc.c
index 332247cf0..e48d469a1 100644
--- a/src/cc65/coptmisc.c
+++ b/src/cc65/coptmisc.c
@@ -788,8 +788,7 @@ unsigned OptBinOps (CodeSeg* S)
                         ** The instruction can be removed if the flags aren't
                         ** used later.
                         */
-                        CodeEntry* N = CS_GetNextEntry (S, I);
-                        if (N && !CE_UseLoadFlags (N)) {
+                        if (!LoadFlagsUsed (S, I+1)) {
                             Delete = 1;
                         }
                     } else if (Operand >= 0) {
@@ -822,8 +821,7 @@ unsigned OptBinOps (CodeSeg* S)
                         ** The instruction can be removed if the flags aren't
                         ** used later.
                         */
-                        CodeEntry* N = CS_GetNextEntry (S, I);
-                        if (N && !CE_UseLoadFlags (N)) {
+                        if (!LoadFlagsUsed (S, I+1)) {
                             Delete = 1;
                         }
                     } else if (Operand >= 0) {
@@ -861,8 +859,7 @@ unsigned OptBinOps (CodeSeg* S)
                         ** The instruction can be removed if the flags aren't
                         ** used later.
                         */
-                        CodeEntry* N = CS_GetNextEntry (S, I);
-                        if (N && !CE_UseLoadFlags (N)) {
+                        if (!LoadFlagsUsed (S, I+1)) {
                             Delete = 1;
                         }
                     } else if (Operand == 0xFF) {