diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/AdjustCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/AdjustCommand.java
index 9e4baebb..07423810 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/AdjustCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/AdjustCommand.java
@@ -78,7 +78,7 @@ public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("object")) {
                 if (arg.object instanceof ListTag) {
                     scriptEntry.addObject("object", arg.object);
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/DebugCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/DebugCommand.java
index 46eda048..cbf2e40e 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/DebugCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/DebugCommand.java
@@ -84,7 +84,7 @@ public enum DebugType {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("type")
                     && arg.limitToOnlyPrefix("type")
                     && arg.matchesEnum(DBINFO)) {
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/EventCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/EventCommand.java
index 5b5d19f7..3c29adff 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/EventCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/EventCommand.java
@@ -56,7 +56,7 @@ public EventCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("context")
                     && arg.matchesPrefix("context", "c")) {
                 scriptEntry.addObject("context", arg.asType(ListTag.class));
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/FlagCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/FlagCommand.java
index 5ed78450..5399ae39 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/FlagCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/FlagCommand.java
@@ -155,7 +155,7 @@ public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("targets")
                 && !arg.hasPrefix()) {
                 scriptEntry.addObject("targets", arg.asType(ListTag.class));
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/NoteCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/NoteCommand.java
index d1d20233..064905ce 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/NoteCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/NoteCommand.java
@@ -60,7 +60,7 @@ public NoteCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesPrefix("as", "i", "id")
                     && !scriptEntry.hasObject("id")) {
                 scriptEntry.addObject("id", arg.asElement());
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/SQLCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/SQLCommand.java
index 557e4b31..ee4d6b2b 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/SQLCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/SQLCommand.java
@@ -111,7 +111,7 @@ public void onDisable() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("sqlid")
                     && arg.matchesPrefix("id")) {
                 scriptEntry.addObject("sqlid", arg.asElement());
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/WebGetCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/WebGetCommand.java
index 056ee813..b2797433 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/WebGetCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/WebGetCommand.java
@@ -95,7 +95,7 @@ public WebGetCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("url")) {
                 scriptEntry.addObject("url", new ElementTag(arg.getRawValue()));
             }
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/file/FileCopyCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/file/FileCopyCommand.java
index 6fd8fcdf..3ec2f8a9 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/file/FileCopyCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/file/FileCopyCommand.java
@@ -55,7 +55,7 @@ public FileCopyCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("origin")
                     && arg.matchesPrefix("origin", "o")) {
                 scriptEntry.addObject("origin", arg.asElement());
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/file/LogCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/file/LogCommand.java
index cfef02dc..65b1149b 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/file/LogCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/file/LogCommand.java
@@ -85,7 +85,7 @@ public enum Type {SEVERE, INFO, WARNING, FINE, FINER, FINEST, NONE, CLEAR}
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("type")
                     && arg.matchesPrefix("type")
                     && arg.matchesEnum(Type.values())) {
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/file/YamlCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/file/YamlCommand.java
index 1f859739..6963af2b 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/file/YamlCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/file/YamlCommand.java
@@ -158,7 +158,7 @@ public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         boolean isSet = false;
         boolean isCopyKey = false;
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("action") &&
                     arg.matchesPrefix("load")) {
                 scriptEntry.addObject("action", new ElementTag("LOAD"));
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/ChooseCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/ChooseCommand.java
index b9c24bb6..136a9a58 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/ChooseCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/ChooseCommand.java
@@ -74,7 +74,7 @@ public ChooseCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("choice")) {
                 scriptEntry.addObject("choice", arg.asElement());
                 break;
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DefineCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DefineCommand.java
index 9df3a0bd..9275885a 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DefineCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DefineCommand.java
@@ -97,7 +97,7 @@ public void setValueAt(String keyName, ObjectTag value) {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("definition")) {
                 if (CoreUtilities.contains(arg.getRawValue(), ':')) {
                     DefinitionActionProvider provider = new DefinitionActionProvider();
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DefineMapCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DefineMapCommand.java
index 9933582d..053aa664 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DefineMapCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DefineMapCommand.java
@@ -55,7 +55,7 @@ public DefineMapCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         MapTag value = new MapTag();
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("definition")
                     && !arg.hasPrefix()) {
                 scriptEntry.addObject("definition", new ElementTag(CoreUtilities.toLowerCase(arg.getValue())));
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DetermineCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DetermineCommand.java
index 6e5c66c1..587e8c8f 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DetermineCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/DetermineCommand.java
@@ -57,7 +57,7 @@ public DetermineCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matches("passive", "passively")
                     && !scriptEntry.hasObject("passively")) {
                 scriptEntry.addObject("passively", new ElementTag(true));
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/ForeachCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/ForeachCommand.java
index a8c0f0d9..65b43005 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/ForeachCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/ForeachCommand.java
@@ -97,7 +97,7 @@ public void reapplyAtEnd(ScriptQueue queue) {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         boolean handled = false;
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!handled
                     && arg.matches("stop") && !arg.hasPrefix()) {
                 scriptEntry.addObject("stop", new ElementTag(true));
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/GotoCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/GotoCommand.java
index 3bec61bf..84f6691c 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/GotoCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/GotoCommand.java
@@ -46,7 +46,7 @@ public GotoCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("m_name")) {
                 scriptEntry.addObject("m_name", arg.asElement());
             }
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/InjectCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/InjectCommand.java
index 42f5aef6..a3656b04 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/InjectCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/InjectCommand.java
@@ -57,7 +57,7 @@ public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matches("instant", "instantly")) {
                 scriptEntry.addObject("instant", new ElementTag(true));
             }
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/MarkCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/MarkCommand.java
index 9d642d89..5b3ef971 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/MarkCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/MarkCommand.java
@@ -39,7 +39,7 @@ public MarkCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("m_name")) {
                 scriptEntry.addObject("m_name", arg.asElement());
             }
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/QueueCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/QueueCommand.java
index d36778ad..5b49a93b 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/QueueCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/QueueCommand.java
@@ -75,7 +75,7 @@ private enum Action {CLEAR, DELAY, PAUSE, RESUME, STOP}
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("action")
                     && arg.matchesEnum(Action.values())) {
                 scriptEntry.addObject("action", Action.valueOf(arg.getValue().toUpperCase()));
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RandomCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RandomCommand.java
index f9be6855..50e75666 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RandomCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RandomCommand.java
@@ -66,7 +66,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
         if (bdat != null && bdat.size() > 0) {
             scriptEntry.addObject("braces", bdat);
         }
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matches("{")) {
                 break;
             }
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RateLimitCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RateLimitCommand.java
index 64db364f..1853cecf 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RateLimitCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RateLimitCommand.java
@@ -52,7 +52,7 @@ public RateLimitCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesArgumentType(DurationTag.class)
                     && !scriptEntry.hasObject("duration")
                     && arg.limitToOnlyPrefix("duration")) {
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RepeatCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RepeatCommand.java
index 865052b7..0e432fa9 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RepeatCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RepeatCommand.java
@@ -76,7 +76,7 @@ public void reapplyAtEnd(ScriptQueue queue) {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         boolean handled = false;
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!handled
                     && arg.matchesInteger() && !arg.hasPrefix()) {
                 scriptEntry.addObject("quantity", arg.asElement());
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RunCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RunCommand.java
index bd6e834c..6fb3318d 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RunCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RunCommand.java
@@ -107,7 +107,7 @@ public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         MapTag defMap = new MapTag();
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesPrefix("i", "id")) {
                 scriptEntry.addObject("id", arg.asElement());
             }
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RunLaterCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RunLaterCommand.java
index 046bfc42..70df521e 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RunLaterCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/RunLaterCommand.java
@@ -68,7 +68,7 @@ public RunLaterCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         MapTag defMap = new MapTag();
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesPrefix("def")) {
                 scriptEntry.addObject("definitions", arg.asType(ListTag.class));
             }
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/StopCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/StopCommand.java
index fb1ac5fa..aa538071 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/StopCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/StopCommand.java
@@ -37,7 +37,7 @@ public StopCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             arg.reportUnhandled();
         }
     }
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/WaitCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/WaitCommand.java
index 297904b8..a2f506f2 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/WaitCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/WaitCommand.java
@@ -50,7 +50,7 @@ public WaitCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesArgumentType(DurationTag.class)
                     && !scriptEntry.hasObject("delay")
                     && arg.limitToOnlyPrefix("delay")) {
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/WaitUntilCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/WaitUntilCommand.java
index 576deecb..0fcc8f37 100644
--- a/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/WaitUntilCommand.java
+++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/queue/WaitUntilCommand.java
@@ -58,7 +58,7 @@ public WaitUntilCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         List<String> arguments = new ArrayList<>(scriptEntry.getOriginalArguments());
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesPrefix("rate")
                     && arg.matchesArgumentType(DurationTag.class)) {
                 scriptEntry.addObject("rate", arg.asType(DurationTag.class));