diff --git a/src/cli/runtime_settings.c b/src/cli/runtime_settings.c
index 1ee4ace7c..c7cb16c91 100644
--- a/src/cli/runtime_settings.c
+++ b/src/cli/runtime_settings.c
@@ -406,9 +406,12 @@ static bool resolve_environment(const char *key, const char **value) {
             continue;
         if (strcmp(settings[i].type, "boolean") == 0) {
             bool enabled = strcmp(environment_values[i], "true") == 0;
-            *value = !enabled && strcmp(key, "CBM_DISABLE_LSP_CROSS") == 0 ? NULL
-                     : enabled                                             ? "1"
-                                                                           : "0";
+            if (enabled)
+                *value = "1";
+            else if (strcmp(key, "CBM_DISABLE_LSP_CROSS") == 0)
+                *value = NULL;
+            else
+                *value = "0";
         } else
             *value = environment_values[i];
         return true;
diff --git a/src/main.c b/src/main.c
index 4d3d8122c..5265fa857 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2815,8 +2815,8 @@ int main(int argc, char **argv) {
     }
 #endif
 
-    bool configure_stateless = role == CBM_DAEMON_PROCESS_STATELESS && argc > 1 &&
-                               strcmp(argv[1], "config") == 0;
+    bool configure_stateless =
+        role == CBM_DAEMON_PROCESS_STATELESS && argc > 1 && strcmp(argv[1], "config") == 0;
     if ((role != CBM_DAEMON_PROCESS_STATELESS && role != CBM_DAEMON_PROCESS_HOOK_CLIENT) ||
         configure_stateless) {
         const char *settings_cache = cbm_resolve_cache_dir();
diff --git a/src/watcher/watcher.h b/src/watcher/watcher.h
index 0fd1a87f7..2986cb57d 100644
--- a/src/watcher/watcher.h
+++ b/src/watcher/watcher.h
@@ -115,8 +115,7 @@ typedef struct {
 /* Thread-safe snapshot with a constant-time registry lookup. A NULL watcher
  * reports both fields false; a NULL project reports only the run-loop state.
  * Registrations can remain present after the watcher has stopped. */
-cbm_watcher_project_status_t cbm_watcher_project_status(cbm_watcher_t *w,
-                                                       const char *project_name);
+cbm_watcher_project_status_t cbm_watcher_project_status(cbm_watcher_t *w, const char *project_name);
 
 /* Return the number of projects in the watch list. */
 int cbm_watcher_watch_count(cbm_watcher_t *w);