diff --git a/buildroot/bin/opt_disable b/buildroot/bin/opt_disable
index 11526132e..18ec03aa9 100755
--- a/buildroot/bin/opt_disable
+++ b/buildroot/bin/opt_disable
@@ -6,8 +6,10 @@ set -e
 SED=$(which gsed || which sed)
 
 for opt in "$@" ; do
-  # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
-  eval "${SED} -i '/\([[:blank:]]*\)\(\/\/\)*\([[:blank:]]*\)\(#define \b${opt}\b\)/{s//\1\3\/\/\4/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
-  eval "${SED} -i '/\([[:blank:]]*\)\(\/\/\)*\([[:blank:]]*\)\(#define \b${opt}\b\)/{s//\1\3\/\/\4/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
-  (echo "ERROR: opt_disable Can't find ${opt}" >&2 && exit 9)
+  DID=0 ; FOUND=0
+  for FN in Configuration Configuration_adv; do
+    "${SED}" -i "/^\(\s*\)\(#define\s\+${opt}\b\s\?\)\(\s\s\)\?/{s//\1\/\/\2/;h};\${x;/./{x;q0};x;q9}" Marlin/$FN.h && DID=1
+    ((DID||FOUND)) || { grep -E "^\s*//\s*#define\s+${opt}\b" Marlin/$FN.h >/dev/null && FOUND=1 ; }
+  done
+  ((DID||FOUND)) || (echo "ERROR: $(basename $0) Can't find ${opt}" >&2 && exit 9)
 done
diff --git a/buildroot/bin/opt_enable b/buildroot/bin/opt_enable
index 9161299b6..d341ee9bd 100755
--- a/buildroot/bin/opt_enable
+++ b/buildroot/bin/opt_enable
@@ -6,8 +6,10 @@ set -e
 SED=$(which gsed || which sed)
 
 for opt in "$@" ; do
-  # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
-  eval "${SED} -i '/^\([[:blank:]]*\/\/\)*[[:blank:]]*\(#define \b${opt}\b\)/{s//\2/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
-  eval "${SED} -i '/^\([[:blank:]]*\/\/\)*[[:blank:]]*\(#define \b${opt}\b\)/{s//\2/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
-  (echo "ERROR: opt_enable Can't find ${opt}" >&2 && exit 9)
+  DID=0 ; FOUND=0
+  for FN in Configuration Configuration_adv; do
+    "${SED}" -i "/^\(\s*\)\/\/\(\s*\)\(#define\s\+${opt}\b\)\( \?\)/{s//\1\2\3\4\4\4/;h};\${x;/./{x;q0};x;q9}" Marlin/$FN.h && DID=1
+    ((DID||FOUND)) || { grep -E "^\s*#define\s+${opt}\b" Marlin/$FN.h >/dev/null && FOUND=1 ; }
+  done
+  ((DID||FOUND)) || (echo "ERROR: $(basename $0) Can't find ${opt}" >&2 && exit 9)
 done
diff --git a/buildroot/bin/opt_set b/buildroot/bin/opt_set
index 2e63790c6..d2d0cc241 100755
--- a/buildroot/bin/opt_set
+++ b/buildroot/bin/opt_set
@@ -5,12 +5,13 @@ set -e
 
 SED=$(which gsed || which sed)
 
-ARGC=$#
 while [[ $# > 1 ]]; do
-  # Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
-  eval "${SED} -i '/^\([[:blank:]]*\)\(\/\/\)*\([[:blank:]]*\)\(#define\s\+\b${1}\b\).*$/{s//\1\3\4 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
-  eval "${SED} -i '/^\([[:blank:]]*\)\(\/\/\)*\([[:blank:]]*\)\(#define\s\+\b${1}\b\).*$/{s//\1\3\4 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
-  eval "echo '#define ${1} ${2}' >>Marlin/Configuration.h" ||
-  (echo "ERROR: opt_set Can't set or add ${1}" >&2 && exit 9)
+  DID=0
+  for FN in Configuration Configuration_adv; do
+    "${SED}" -i "/^\(\s*\)\/*\s*\(#define\s\+${1}\b\)\(.*\)$/{s//\1\2 ${2} \/\/ \3/;h};\${x;/./{x;q0};x;q9}" Marlin/$FN.h && DID=1
+  done
+  ((DID)) ||
+    eval "echo '#define ${1} ${2}' >>Marlin/Configuration.h" ||
+      (echo "ERROR: opt_set Can't set or add ${1}" >&2 && exit 9)
   shift 2
 done