diff --git a/src/common/library.c b/src/common/library.c
index 4f34a371c..060af6d3f 100644
--- a/src/common/library.c
+++ b/src/common/library.c
@@ -2,7 +2,6 @@
 
 #include <stdarg.h>
 
-//common/libraries.c
 void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...)
 {
     if(userProvidedName->length > 0)
@@ -12,13 +11,12 @@ void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...)
     va_start(defaultNames, userProvidedName);
 
     void* result = NULL;
+    const char* name = va_arg(defaultNames, const char*);
 
-    while(result == NULL)
+    while(result == NULL && name != NULL)
     {
-        const char* name = va_arg(defaultNames, const char*);
-        if(name == NULL)
-            break;
         result = dlopen(name, RTLD_LAZY);
+        name = va_arg(defaultNames, const char*);
     }
 
     va_end(defaultNames);
diff --git a/src/common/parsing.c b/src/common/parsing.c
index ac1197dd6..e887f9092 100644
--- a/src/common/parsing.c
+++ b/src/common/parsing.c
@@ -394,11 +394,6 @@ void ffParseSemver(FFstrbuf* buffer, const FFstrbuf* major, const FFstrbuf* mino
     ffStrbufAppend(buffer, patch);
 }
 
-static inline bool charIsNegliable(char c)
-{
-    return c == ' ' || c == '\t' || c == '\n' || c == '\r';
-}
-
 bool ffStrSet(const char* str)
 {
     if(str == NULL)
@@ -406,7 +401,7 @@ bool ffStrSet(const char* str)
 
     while(*str != '\0')
     {
-        if(!charIsNegliable(*str))
+        if(*str != ' ' && *str != '\t' && *str != '\n' && *str != '\r')
             return true;
     }