diff --git a/src/Battling/ScriptHandling/ScriptMacros.hpp b/src/Battling/ScriptHandling/ScriptMacros.hpp
index c127ad5..e1420e6 100644
--- a/src/Battling/ScriptHandling/ScriptMacros.hpp
+++ b/src/Battling/ScriptHandling/ScriptMacros.hpp
@@ -2,7 +2,7 @@
     {                                                                                                                  \
         try {                                                                                                          \
             auto aggregator = (source)->GetScriptIterator();                                                           \
-            ArbUt::BorrowedPtr<CreatureLib::Battling::BattleScript> next = (CreatureLib::Battling::BattleScript*)1;    \
+            ArbUt::BorrowedPtr<CreatureLib::Battling::BattleScript> next;                                              \
             while (aggregator.GetNext(next)) {                                                                         \
                 if (next->IsSuppressed()) {                                                                            \
                     continue;                                                                                          \
@@ -25,11 +25,11 @@
         try {                                                                                                          \
             if (scriptWrapper.HasValue()) {                                                                            \
                 if (scriptWrapper.IsSet()) {                                                                           \
-                    for (const auto& sv : scriptWrapper.GetScriptSet()->GetIterator()) {                               \
-                        if (sv->IsSuppressed()) {                                                                      \
+                    for (const auto& scriptIterator : scriptWrapper.GetScriptSet()->GetIterator()) {                   \
+                        if (scriptIterator->IsSuppressed()) {                                                          \
                             continue;                                                                                  \
                         }                                                                                              \
-                        sv->hookName(__VA_ARGS__);                                                                     \
+                        scriptIterator->hookName(__VA_ARGS__);                                                         \
                     }                                                                                                  \
                 } else {                                                                                               \
                     if (scriptWrapper.GetScript()->get()->IsSuppressed()) {                                            \