diff --git a/cleo_plugins/DebugUtils/DebugUtils.cpp b/cleo_plugins/DebugUtils/DebugUtils.cpp
index f96e700b..bd999f82 100644
--- a/cleo_plugins/DebugUtils/DebugUtils.cpp
+++ b/cleo_plugins/DebugUtils/DebugUtils.cpp
@@ -232,8 +232,8 @@ class DebugUtils
         }
         else // breakpoint formatted name string
         {
-            auto format = CLEO_ReadStringOpcodeParam(thread);
-            name = CLEO_ReadParamsFormatted(thread, format);
+            OPCODE_READ_PARAM_STRING_FORMATTED(nameStr);
+            name = nameStr;
         }
 
         pausedScripts.emplace_back(thread, name.c_str());
@@ -262,8 +262,7 @@ class DebugUtils
             return OR_CONTINUE;
         }
 
-        auto format = CLEO_ReadStringOpcodeParam(thread);
-        auto message = CLEO_ReadParamsFormatted(thread, format);
+        OPCODE_READ_PARAM_STRING_FORMATTED(message);
 
         CLEO_Log(eLogLevel::Debug, message);
         return OR_CONTINUE;
diff --git a/cleo_plugins/FileSystemOperations/FileSystemOperations.cpp b/cleo_plugins/FileSystemOperations/FileSystemOperations.cpp
index 6b09d0b1..140aabfc 100644
--- a/cleo_plugins/FileSystemOperations/FileSystemOperations.cpp
+++ b/cleo_plugins/FileSystemOperations/FileSystemOperations.cpp
@@ -355,8 +355,7 @@ class FileSystemOperations
     static OpcodeResult WINAPI opcode_0AD9(CRunningScript* thread)
     {
         OPCODE_READ_PARAM_FILE_HANDLE(handle);
-        OPCODE_READ_PARAM_STRING(format);
-        static char text[4 * MAX_STR_LEN]; CLEO_ReadParamsFormatted(thread, format, text, MAX_STR_LEN);
+        OPCODE_READ_PARAM_STRING_FORMATTED(text);
         
         auto ok = File::writeString(handle, text);
         if (!ok)