Index: generic/nsf.c
===================================================================
diff -u -N -re75c61b1b73f1cf239b060680e2408fa36d697fe -rb7c03b14ecbb8b6c6411e5b90b3b7363ebab23e1
--- generic/nsf.c	(.../nsf.c)	(revision e75c61b1b73f1cf239b060680e2408fa36d697fe)
+++ generic/nsf.c	(.../nsf.c)	(revision b7c03b14ecbb8b6c6411e5b90b3b7363ebab23e1)
@@ -2634,16 +2634,17 @@
     NsfClass *sc = sl->cl;
 
     if (sc->color == GRAY ||
-        unlikely(sc->color == WHITE &&
-                 !TopoSortSub(sc, baseClass, withMixinOfs))) {
+        unlikely(sc->color == WHITE
+                 && !TopoSortSub(sc, baseClass, withMixinOfs))
+        ) {
       isAcyclic = NSF_FALSE;
       break;
     }
 
   }
 
   if (isAcyclic && withMixinOfs) {
-    NsfCmdList *classMixins = ((class->opt != NULL) && class->opt->isClassMixinOf) ? class->opt->isClassMixinOf : NULL;
+    NsfCmdList *classMixins = ((class->opt != NULL) ? class->opt->isClassMixinOf : NULL);
 
     for (; classMixins != NULL; classMixins = classMixins->nextPtr) {
       NsfClass *sc = NsfGetClassFromCmdPtr(classMixins->cmdPtr);