diff --git a/src/sheet.c b/src/sheet.c
index 16b93210..6958c8cc 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -136,7 +136,6 @@ GLOBAL READONLY struct sheet g_sheet_loading = {
     .loading = true
 };
 
-
 /* ========================== *
  * Thread local state
  * ========================== */
@@ -611,13 +610,13 @@ INTERNAL SYS_THREAD_ENTRY_POINT_FUNC_DEF(sheet_loader_thread_entry_point, arg)
     __prof;
     (UNUSED)arg;
 
-    while (true) {
+    b32 abort = false;
+    while (!abort) {
         sys_mutex_lock(&G.loaders_mutex);
 
         if (G.loaders_shutdown) {
-            /* Thread shutdown */
-            sys_mutex_unlock(&G.loaders_mutex);
-            break;
+            /* Exit thread */
+            abort = true;
         } else if (!G.first_loader_cmd) {
             /* Wait for work */
             sys_condition_variable_wait(&G.loaders_cv, &G.loaders_mutex);
@@ -667,13 +666,13 @@ INTERNAL SYS_THREAD_ENTRY_POINT_FUNC_DEF(sheet_evictor_thread_entry_point, arg)
 {
     (UNUSED)arg;
 
-    while (true) {
+    b32 abort = false;
+    while (!abort) {
         struct temp_arena scratch = scratch_begin_no_conflict();
         struct evict_node *head_consider = NULL;
         struct evict_node *head_consider_lru = NULL;
         struct evict_node *head_evicted = NULL;
 
-        b32 abort = false;
         sys_mutex_lock(&G.evictor_mutex);
         {
             /* Thread shutdown */
@@ -729,7 +728,10 @@ INTERNAL SYS_THREAD_ENTRY_POINT_FUNC_DEF(sheet_evictor_thread_entry_point, arg)
 #endif
 
                                         /* Check usage time */
-                                        if (!RESOURCE_RELOADING || (!consider_for_eviction && cache_over_budget)) {
+#if RESOURCE_RELOADING
+                                        if (cache_over_budget) /* Only check conditional if RESOURCE_RELOADING, since over-budget is assumed to be true otherwise */
+#endif
+                                        {
                                             f64 last_used_time = (f64)refcount.last_modified_cycle * EVICTOR_CYCLE_INTERVAL;
                                             if (cur_time - last_used_time > EVICTOR_GRACE_PERIOD) {
                                                 /* Cache is over budget and node hasn't been referenced in a while */
@@ -782,18 +784,16 @@ INTERNAL SYS_THREAD_ENTRY_POINT_FUNC_DEF(sheet_evictor_thread_entry_point, arg)
                 /* Remove evictable nodes from cache table until under budget */
                 if (head_consider_lru) {
                     __profscope(eviction_cache_removal);
-                    for (struct evict_node *en = head_consider_lru; en; en = en->next_consider_lru) {
+                    b32 stop_evicting = false;
+                    for (struct evict_node *en = head_consider_lru; en && !stop_evicting; en = en->next_consider_lru) {
                         struct cache_bucket *bucket = en->cache_bucket;
                         struct cache_node *n = en->cache_node;
-
                         sys_rw_mutex_lock_exclusive(&bucket->rw_mutex);
                         {
                             struct cache_node_refcount refcount = *(struct cache_node_refcount *)atomic_u64_raw(&n->refcount_struct);
                             if (refcount.count > 0 || ((refcount.last_modified_cycle != en->refcount.last_modified_cycle) && !en->force_evict)) {
                                 /* Cache node has been referenced since scan, skip eviction. */
-                                continue;
-                            }
-                            if (en->force_evict || atomic_u64_eval(&G.cache.memory_usage) > CACHE_MEMORY_BUDGET) {
+                            } else if (en->force_evict || atomic_u64_eval(&G.cache.memory_usage) > CACHE_MEMORY_BUDGET) {
                                 /* Remove from cache bucket */
                                 if (n->prev_hash) {
                                     n->prev_hash->next_hash = n->next_hash;
@@ -809,7 +809,7 @@ INTERNAL SYS_THREAD_ENTRY_POINT_FUNC_DEF(sheet_evictor_thread_entry_point, arg)
                                 head_evicted = en;
                             } else {
                                 /* Cache is no longer over budget or force evicting, stop iteration */
-                                break;
+                                stop_evicting = true;
                             }
                         }
                         sys_rw_mutex_unlock_exclusive(&bucket->rw_mutex);
@@ -843,8 +843,5 @@ INTERNAL SYS_THREAD_ENTRY_POINT_FUNC_DEF(sheet_evictor_thread_entry_point, arg)
         }
         sys_mutex_unlock(&G.evictor_mutex);
         scratch_end(scratch);
-        if (abort) {
-            break;
-        }
     }
 }
diff --git a/src/work.c b/src/work.c
index 8d2fe230..902a69d5 100644
--- a/src/work.c
+++ b/src/work.c
@@ -391,13 +391,14 @@ INTERNAL SYS_THREAD_ENTRY_POINT_FUNC_DEF(worker_thread_entry_point, thread_data)
         .is_worker = true
     };
 
-    while (true) {
+    b32 abort = false;
+    while (!abort) {
         sys_mutex_lock(&G.mutex);
         {
             /* Check for exit */
             if (G.workers_shutdown) {
-                sys_mutex_unlock(&G.mutex);
-                break;
+                /* Exit thread */
+                abort = true;
             } else if (!G.scheduled_work_head) {
                 /* Wait for work */
                 sys_condition_variable_wait(&G.cv, &G.mutex);