diff --git a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp b/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp
index 0e2f94c356b0c9bd84e9982e315a4d6ee4b639ee..a07f6ab2029de67c7ef508ebb18c9216b750665b 100644
--- a/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp
+++ b/Marlin/src/HAL/HAL_LINUX/hardware/Heater.cpp
@@ -49,7 +49,7 @@ void Heater::update() {
     last = now;
     heat += (heater_state - heat) * (delta / 1000000000.0);
 
-    if (heat < room_temp_raw) heat = room_temp_raw;
+    NOLESS(heat, room_temp_raw);
     Gpio::pin_map[analogInputToDigitalPin(adc_pin)].value = 0xFFFF - (uint16_t)heat;
   }
 }
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 51702fa2292b309ddcf474563a64a6738848e088..72b15410fe4219727641ab63b8d27550d4798e95 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -798,7 +798,7 @@ void CardReader::setroot() {
 
       // Never sort more than the max allowed
       // If you use folders to organize, 20 may be enough
-      if (fileCnt > SDSORT_LIMIT) fileCnt = SDSORT_LIMIT;
+      NOMORE(fileCnt, SDSORT_LIMIT);
 
       // Sort order is always needed. May be static or dynamic.
       #if ENABLED(SDSORT_DYNAMIC_RAM)