diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/CooldownCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/CooldownCommand.java
index 6860e42f40..af6cd0a36f 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/CooldownCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/CooldownCommand.java
@@ -76,7 +76,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.matchesPrefix("script", "s")
                     && arg.matchesArgumentType(ScriptTag.class)) {
                 scriptEntry.addObject("script", arg.asType(ScriptTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ResetCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ResetCommand.java
index cee7acd7c6..c0501e704b 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ResetCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ResetCommand.java
@@ -49,7 +49,7 @@ private enum Type {PLAYER_COOLDOWN, GLOBAL_COOLDOWN}
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matches("cooldown")
                     && !scriptEntry.hasObject("type")) {
                 scriptEntry.addObject("type", Type.PLAYER_COOLDOWN);
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ZapCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ZapCommand.java
index 5099d92fc0..57ceaf61bd 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ZapCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ZapCommand.java
@@ -87,7 +87,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("script")
                     && !scriptEntry.hasObject("step")
                     && arg.hasPrefix()
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java
index 8a403de597..465587fafc 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java
@@ -62,7 +62,7 @@ private enum AgeType {ADULT, BABY}
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (!scriptEntry.hasObject("entities")
                     && arg.matchesArgumentList(EntityTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AnimateCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AnimateCommand.java
index 3ccf805f75..0296ee3314 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AnimateCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AnimateCommand.java
@@ -87,7 +87,7 @@ public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         AnimationHelper animationHelper = NMSHandler.getAnimationHelper();
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("for")
                     && arg.matchesPrefix("for")
                     && arg.matchesArgumentList(PlayerTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AttachCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AttachCommand.java
index 01fd0589a4..af8bb2043c 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AttachCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AttachCommand.java
@@ -72,7 +72,7 @@ public AttachCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("to")
                     && !scriptEntry.hasObject("cancel")
                     && arg.matchesPrefix("to")
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AttackCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AttackCommand.java
index aab1775225..2d0426b084 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AttackCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AttackCommand.java
@@ -60,7 +60,7 @@ public AttackCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("cancel")
                     && arg.matches("cancel", "stop")) {
                 scriptEntry.addObject("cancel", "true");
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/BurnCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/BurnCommand.java
index b8b73c8466..fd3feb95bb 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/BurnCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/BurnCommand.java
@@ -53,7 +53,7 @@ public BurnCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("entities")
                     && arg.matchesArgumentList(EntityTag.class)) {
                 scriptEntry.addObject("entities", arg.asType(ListTag.class).filter(EntityTag.class, scriptEntry));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/CastCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/CastCommand.java
index bc444bcd36..a319d4276e 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/CastCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/CastCommand.java
@@ -85,7 +85,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("remove")
                     && arg.matches("remove", "cancel")) {
                 scriptEntry.addObject("remove", new ElementTag(true));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/EquipCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/EquipCommand.java
index a5efe7a988..265ccf51ba 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/EquipCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/EquipCommand.java
@@ -69,7 +69,7 @@ public EquipCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         Map<String, ItemTag> equipment = new HashMap<>();
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("entities")
                     && arg.matchesArgumentList(EntityTag.class)) {
                 scriptEntry.addObject("entities", arg.asType(ListTag.class).filter(EntityTag.class, scriptEntry));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FakeEquipCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FakeEquipCommand.java
index 211c776d99..7e832e6364 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FakeEquipCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FakeEquipCommand.java
@@ -78,7 +78,7 @@ public FakeEquipCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         EquipmentOverride equipment = new EquipmentOverride();
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("entities")
                     && arg.matchesArgumentList(EntityTag.class)) {
                 scriptEntry.addObject("entities", arg.asType(ListTag.class).filter(EntityTag.class, scriptEntry));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FeedCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FeedCommand.java
index a3a6be5557..d2c1cc329b 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FeedCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FeedCommand.java
@@ -63,7 +63,7 @@ public FeedCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesInteger()
                     && arg.matchesPrefix("amount", "amt", "quantity", "qty", "a", "q")
                     && !scriptEntry.hasObject("amount")) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FlyCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FlyCommand.java
index b3da524bf2..447cd5c639 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FlyCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FlyCommand.java
@@ -68,7 +68,7 @@ public FlyCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("cancel")
                     && arg.matches("cancel")) {
                 scriptEntry.addObject("cancel", "");
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FollowCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FollowCommand.java
index dd5df8709e..c0ff6bc84e 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FollowCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/FollowCommand.java
@@ -67,7 +67,7 @@ public FollowCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("stop") &&
                     arg.matches("stop")) {
                 scriptEntry.addObject("stop", new ElementTag(true));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HeadCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HeadCommand.java
index 1f886da4a8..e6f953343c 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HeadCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HeadCommand.java
@@ -32,7 +32,7 @@ public HeadCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("material")
                     && arg.matchesArgumentType(MaterialTag.class)
                     && !arg.matchesPrefix("skin", "s")) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealCommand.java
index a0e5a8aa45..988e02dd5f 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealCommand.java
@@ -58,7 +58,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
 
         boolean specified_targets = false;
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (!scriptEntry.hasObject("amount")
                     && arg.matchesFloat()) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealthCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealthCommand.java
index 1f3922e36b..eacdd0bbfd 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealthCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealthCommand.java
@@ -71,7 +71,7 @@ public HealthCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("target")
                     && arg.matches("player")) {
                 if (!Utilities.entryHasPlayer(scriptEntry)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HurtCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HurtCommand.java
index 2891fdf2e4..20ad3db923 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HurtCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HurtCommand.java
@@ -73,7 +73,7 @@ public HurtCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("amount")
                     && (arg.matchesFloat()
                     || arg.matchesInteger())) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/InvisibleCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/InvisibleCommand.java
index 23b073f048..bcc3a45e22 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/InvisibleCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/InvisibleCommand.java
@@ -57,7 +57,7 @@ enum Action {TRUE, FALSE, TOGGLE}
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("state")
                     && arg.matchesEnum(Action.values())) {
                 scriptEntry.addObject("state", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LeashCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LeashCommand.java
index d9a4e68396..938c0d8eb1 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LeashCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LeashCommand.java
@@ -60,7 +60,7 @@ public LeashCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("cancel")
                     && arg.matches("cancel", "stop")) {
                 scriptEntry.addObject("cancel", "");
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java
index a8908171b5..0241e3117d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java
@@ -64,7 +64,7 @@ public LookCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("location")
                     && !scriptEntry.hasObject("cancel")
                     && arg.matchesArgumentType(LocationTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/MountCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/MountCommand.java
index b1f8c3f210..4aaec1df3b 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/MountCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/MountCommand.java
@@ -63,7 +63,7 @@ public MountCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         List<EntityTag> entities = null;
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("cancel")
                     && arg.matches("cancel")) {
                 scriptEntry.addObject("cancel", "");
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java
index 3b4b0c58d3..a6f8213cdf 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/PushCommand.java
@@ -85,7 +85,7 @@ public PushCommand() {
 
     @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", "source", "shooter", "s")) {
                 if (arg.matchesArgumentType(EntityTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RemoveCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RemoveCommand.java
index 59233e4295..f013ccf42f 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RemoveCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RemoveCommand.java
@@ -60,7 +60,7 @@ public RemoveCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("entities")
                     && arg.matchesArgumentList(EntityTag.class)) {
                 scriptEntry.addObject("entities", arg.asType(ListTag.class).filter(EntityTag.class, scriptEntry));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RenameCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RenameCommand.java
index bb13181500..ee1d70ffc9 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RenameCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RenameCommand.java
@@ -88,7 +88,7 @@ public RenameCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("targets")
                     && arg.matchesPrefix("t", "target", "targets")) {
                 scriptEntry.addObject("targets", ListTag.getListFor(TagManager.tagObject(arg.getValue(), scriptEntry.getContext()), scriptEntry.getContext()));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java
index f908497815..f52edd2dfd 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java
@@ -70,7 +70,7 @@ public RotateCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("cancel")
                     && (arg.matches("cancel") || arg.matches("stop"))) {
                 scriptEntry.addObject("cancel", new ElementTag("true"));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java
index 8e7bb0a761..2eb90c25dd 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/ShootCommand.java
@@ -100,7 +100,7 @@ public ShootCommand() {
 
     @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", "source", "s")) {
 
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SneakCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SneakCommand.java
index c0dd1612f9..d0169c62eb 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SneakCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SneakCommand.java
@@ -63,7 +63,7 @@ public SneakCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matches("fake")
                     && !scriptEntry.hasObject("fake")
                     && !scriptEntry.hasObject("stopfake")) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SpawnCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SpawnCommand.java
index cf75ba1c61..1a5fc06b9c 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SpawnCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/SpawnCommand.java
@@ -72,7 +72,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("entities")
                     && arg.matchesArgumentList(EntityTag.class)) {
                 EntityTag.allowDespawnedNpcs = true;
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/TeleportCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/TeleportCommand.java
index 9668307156..4c5dc12a62 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/TeleportCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/TeleportCommand.java
@@ -73,7 +73,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("location")
                     && arg.matchesArgumentType(LocationTag.class)) {
                 scriptEntry.addObject("location", arg.asType(LocationTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java
index 0302c0837b..f02f0dd47d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java
@@ -104,7 +104,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("lookat")
                     && arg.matchesPrefix("lookat")
                     && arg.matchesArgumentType(LocationTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/DisplayItemCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/DisplayItemCommand.java
index 6a6272e272..6c26785c9d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/DisplayItemCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/DisplayItemCommand.java
@@ -87,7 +87,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.matchesArgumentType(DurationTag.class)
                     && !scriptEntry.hasObject("duration")) {
                 scriptEntry.addObject("duration", arg.asType(DurationTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/FakeItemCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/FakeItemCommand.java
index a32e911ade..43a67f6a78 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/FakeItemCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/FakeItemCommand.java
@@ -75,7 +75,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("slot")
                     && arg.matchesPrefix("slot")) {
                 scriptEntry.addObject("slot", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java
index 856f09653f..3bb80e515c 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java
@@ -90,7 +90,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("quantity")
                     && arg.matchesPrefix("q", "qty", "quantity")
                     && arg.matchesFloat()) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java
index 1d8131cd91..1a836d904e 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java
@@ -175,7 +175,7 @@ public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         boolean isAdjust = false, isFlag = false;
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("origin")
                     && arg.matchesPrefix("origin", "o", "source", "items", "item", "i", "from", "f")
                     && (arg.matchesArgumentTypes(InventoryTag.class, EntityTag.class, LocationTag.class, MapTag.class)
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/MapCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/MapCommand.java
index 0782a64d83..be29e35121 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/MapCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/MapCommand.java
@@ -84,7 +84,7 @@ public MapCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("new")
                     && arg.matchesPrefix("new")
                     && arg.matchesArgumentType(WorldTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/NBTCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/NBTCommand.java
index 7f52a5db28..2e3aa3f77f 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/NBTCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/NBTCommand.java
@@ -23,7 +23,7 @@ public NBTCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (!scriptEntry.hasObject("key")
                     && arg.getRawValue().split(":", 2).length == 2) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/ScribeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/ScribeCommand.java
index 4ce6eccdc8..9254571cba 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/ScribeCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/ScribeCommand.java
@@ -32,7 +32,7 @@ private enum BookAction {GIVE, DROP, EQUIP, NONE}
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (arg.matchesEnum(BookAction.values())
                     && !scriptEntry.hasObject("action")) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java
index 5e949edde6..b28d313280 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java
@@ -132,7 +132,7 @@ else if (arg.startsWith("item:")) {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("type")
                     && arg.matches("money", "coins")) {
                 Deprecations.giveTakeMoney.warn(scriptEntry);
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/ActionCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/ActionCommand.java
index 8a3060d42a..ce9fe8d78a 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/ActionCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/ActionCommand.java
@@ -55,7 +55,7 @@ public ActionCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (!scriptEntry.hasObject("npcs")
                     && arg.matchesArgumentList(NPCTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AnchorCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AnchorCommand.java
index 483933bce9..54c78169ac 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AnchorCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AnchorCommand.java
@@ -56,7 +56,7 @@ private enum Action { ADD, REMOVE }
 
     @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/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AssignmentCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AssignmentCommand.java
index 9833127060..12dac89b00 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AssignmentCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AssignmentCommand.java
@@ -75,7 +75,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.matchesEnum(Action.values())
                     && !scriptEntry.hasObject("action")) {
                 scriptEntry.addObject("action", Action.valueOf(arg.getValue().toUpperCase()));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java
index 9c3223caff..6f96cafb59 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java
@@ -65,7 +65,7 @@ public BreakCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (!scriptEntry.hasObject("location")
                     && arg.matchesArgumentType(LocationTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/CreateCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/CreateCommand.java
index f4b0a982d1..dc02c55d93 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/CreateCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/CreateCommand.java
@@ -69,7 +69,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("entity_type")
                     && arg.matchesArgumentType(EntityTag.class)) {
                 // Avoid duplication of objects
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/DespawnCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/DespawnCommand.java
index 4c5d471999..76dd9562a5 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/DespawnCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/DespawnCommand.java
@@ -52,7 +52,7 @@ public DespawnCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("npcs")
                     && arg.matchesArgumentList(NPCTag.class)) {
                 scriptEntry.addObject("npcs", arg.asType(ListTag.class).filter(NPCTag.class, scriptEntry));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/EngageCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/EngageCommand.java
index 8de6c8085f..497d04037d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/EngageCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/EngageCommand.java
@@ -78,7 +78,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
             throw new InvalidArgumentsException("This command requires a linked NPC!");
         }
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (!scriptEntry.hasObject("duration")
                     && arg.matchesArgumentType(DurationTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/FishCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/FishCommand.java
index c82137439b..6b7655615a 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/FishCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/FishCommand.java
@@ -50,7 +50,7 @@ public FishCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("location")
                     && arg.matchesArgumentType(LocationTag.class)) {
                 scriptEntry.addObject("location", arg.asType(LocationTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/LookcloseCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/LookcloseCommand.java
index cf3a2164fc..7ce7d60b9a 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/LookcloseCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/LookcloseCommand.java
@@ -55,7 +55,7 @@ public LookcloseCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (arg.matches("realistic", "realistically")) {
                 scriptEntry.addObject("realistic", new ElementTag(true));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PauseCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PauseCommand.java
index b1d90af901..948db53ce0 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PauseCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PauseCommand.java
@@ -96,7 +96,7 @@ enum PauseType {ACTIVITY, WAYPOINTS, NAVIGATION}
 
     @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")) {
                 scriptEntry.addObject("duration", arg.asType(DurationTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PoseCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PoseCommand.java
index 3dcc818c40..4596078cea 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PoseCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PoseCommand.java
@@ -60,7 +60,7 @@ private enum Action {ADD, REMOVE, ASSUME}
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matches("add", "assume", "remove")) {
                 scriptEntry.addObject("action", Action.valueOf(arg.getValue().toUpperCase()));
             }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PushableCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PushableCommand.java
index 608acc632b..292cef4070 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PushableCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PushableCommand.java
@@ -49,7 +49,7 @@ private enum Toggle {TOGGLE, TRUE, FALSE, ON, OFF}
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (!scriptEntry.hasObject("state")
                     && arg.matchesPrefix("state", "s")
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/SitCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/SitCommand.java
index 503a7be2bf..88804f590c 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/SitCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/SitCommand.java
@@ -45,7 +45,7 @@ public SitCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesArgumentType(LocationTag.class)
                     && !scriptEntry.hasObject("location")) {
                 scriptEntry.addObject("location", arg.asType(LocationTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/SleepCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/SleepCommand.java
index 3d3dbda952..575633a307 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/SleepCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/SleepCommand.java
@@ -45,7 +45,7 @@ public SleepCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesArgumentType(LocationTag.class)
                     && !scriptEntry.hasObject("location")) {
                 scriptEntry.addObject("location", arg.asType(LocationTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/StandCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/StandCommand.java
index 5fc261d9cf..32baa9499d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/StandCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/StandCommand.java
@@ -47,7 +47,7 @@ public StandCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         //stand should have no additional arguments
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             arg.reportUnhandled();
         }
         if (!Utilities.entryHasNPC(scriptEntry)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TraitCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TraitCommand.java
index f521388bf8..c18a292ddd 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TraitCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TraitCommand.java
@@ -75,7 +75,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("state")
                     && arg.matchesPrefix("state", "s")
                     && arg.matchesEnum(Toggle.values())) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TriggerCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TriggerCommand.java
index fb21ba0ab8..6df6c4abe1 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TriggerCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/TriggerCommand.java
@@ -83,7 +83,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("cooldown")
                     && arg.matchesPrefix("cooldown", "c")
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/VulnerableCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/VulnerableCommand.java
index ea4345bf45..d4a83cfea2 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/VulnerableCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/VulnerableCommand.java
@@ -47,7 +47,7 @@ enum Toggle {TRUE, FALSE, TOGGLE}
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("action") && arg.matchesEnum(Toggle.values())) {
                 scriptEntry.addObject("action", arg.asElement());
             }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java
index 92df43bd6e..29aa6ad439 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java
@@ -86,7 +86,7 @@ public AdvancementCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("id")
                     && arg.matchesPrefix("id")) {
                 scriptEntry.addObject("id", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/BlockCrackCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/BlockCrackCommand.java
index 139f0ff492..0a7da803c6 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/BlockCrackCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/BlockCrackCommand.java
@@ -64,7 +64,7 @@ public BlockCrackCommand() {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (arg.matchesPrefix("players")
                     && arg.matchesArgumentList(PlayerTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ChatCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ChatCommand.java
index d6bb1692c7..6479481739 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ChatCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ChatCommand.java
@@ -71,7 +71,7 @@ public ChatCommand() {
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         boolean specified_targets = false;
         boolean specified_talker = false;
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesPrefix("target", "targets", "t")) {
                 if (arg.matchesArgumentList(EntityTag.class)) {
                     scriptEntry.addObject("targets", arg.asType(ListTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ClickableCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ClickableCommand.java
index fd17130aa9..7457f3799d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ClickableCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ClickableCommand.java
@@ -127,7 +127,7 @@ public static void runClickable(UUID id, Player player) {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         MapTag defMap = new MapTag();
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("definitions")
                     && arg.matchesPrefix("def")) {
                 scriptEntry.addObject("definitions", arg.asType(ListTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/CompassCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/CompassCommand.java
index c6e8c0cdd7..1b2417fee7 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/CompassCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/CompassCommand.java
@@ -68,7 +68,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("location")
                     && arg.matchesArgumentType(LocationTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DebugBlockCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DebugBlockCommand.java
index f334bdf471..a7e4667f1f 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DebugBlockCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DebugBlockCommand.java
@@ -64,7 +64,7 @@ public DebugBlockCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("players")
                     && arg.matchesPrefix("to", "players")) {
                 scriptEntry.addObject("players", arg.asType(ListTag.class).filter(PlayerTag.class, scriptEntry));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DisguiseCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DisguiseCommand.java
index e391a3b222..c1d876ed7b 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DisguiseCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/DisguiseCommand.java
@@ -93,7 +93,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("players")
                     && arg.matchesPrefix("to", "players")) {
                 scriptEntry.addObject("players", arg.asType(ListTag.class).filter(PlayerTag.class, scriptEntry));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ExperienceCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ExperienceCommand.java
index 823c62eca5..c0c2e34b1a 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ExperienceCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ExperienceCommand.java
@@ -86,7 +86,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
         Type type = Type.SET;
         boolean level = false;
         boolean silent = false;
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesInteger()) {
                 amount = arg.asElement().asInt();
             }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/FakeSpawnCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/FakeSpawnCommand.java
index aa4bcafab6..d204f849a3 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/FakeSpawnCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/FakeSpawnCommand.java
@@ -66,7 +66,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("players")
                     && arg.matchesPrefix("to", "players")) {
                 scriptEntry.addObject("players", arg.asType(ListTag.class).filter(PlayerTag.class, scriptEntry));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/GlowCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/GlowCommand.java
index 446ca24c8c..1dbb6d19d6 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/GlowCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/GlowCommand.java
@@ -70,7 +70,7 @@ public static void unGlow(LivingEntity e) {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("entities")
                     && arg.matchesArgumentList(EntityTag.class)) {
                 scriptEntry.addObject("entities", arg.asType(ListTag.class).filter(EntityTag.class, scriptEntry));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/GroupCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/GroupCommand.java
index 2706e4082b..223235c9c8 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/GroupCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/GroupCommand.java
@@ -64,7 +64,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
         if (Depends.permissions == null) {
             throw new InvalidArgumentsException("Permissions not linked - is Vault improperly installed, or is there no permissions plugin?");
         }
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("action")
                     && arg.matchesEnum(Action.values())) {
                 scriptEntry.addObject("action", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ItemCooldownCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ItemCooldownCommand.java
index c7568b8641..dc8d261356 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ItemCooldownCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ItemCooldownCommand.java
@@ -61,7 +61,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("materials")
                     && (arg.matchesArgumentType(MaterialTag.class)
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/KickCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/KickCommand.java
index cb49ac0f7c..4f1a9e359f 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/KickCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/KickCommand.java
@@ -51,7 +51,7 @@ public KickCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesPrefix("reason")) {
                 scriptEntry.addObject("reason", arg.asElement());
             }
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/MoneyCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/MoneyCommand.java
index 309e5d64d9..d01e2496f7 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/MoneyCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/MoneyCommand.java
@@ -73,7 +73,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
             Debug.echoError("No economy loaded! Have you installed Vault and a compatible economy plugin?");
             return;
         }
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("action")
                     && arg.matchesEnum(Action.values())) {
                 scriptEntry.addObject("action", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/OpenTradesCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/OpenTradesCommand.java
index 18f6257570..42d91a9e65 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/OpenTradesCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/OpenTradesCommand.java
@@ -65,7 +65,7 @@ public OpenTradesCommand() {
 
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (!scriptEntry.hasObject("trades")
                     && !scriptEntry.hasObject("entity")
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/OxygenCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/OxygenCommand.java
index f93aba534a..46f1d574eb 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/OxygenCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/OxygenCommand.java
@@ -53,7 +53,7 @@ public enum Mode {SET, ADD, REMOVE}
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("type")
                     && arg.matchesPrefix("type", "t")
                     && arg.matchesEnum(Type.values())) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/PermissionCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/PermissionCommand.java
index 7a4337dc78..f85a430d9c 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/PermissionCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/PermissionCommand.java
@@ -66,7 +66,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
         if (Depends.permissions == null) {
             throw new InvalidArgumentsException("Permissions not linked - is Vault improperly installed, or is there no permissions plugin?");
         }
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("action")
                     && arg.matchesEnum(Action.values())) {
                 scriptEntry.addObject("action", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ResourcePackCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ResourcePackCommand.java
index 02e3150b30..dfcf2184d7 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ResourcePackCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ResourcePackCommand.java
@@ -62,7 +62,7 @@ public ResourcePackCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("url")
                     && arg.matchesPrefix("url")) {
                 scriptEntry.addObject("url", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ShowFakeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ShowFakeCommand.java
index f522455d04..b485b6589b 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ShowFakeCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ShowFakeCommand.java
@@ -90,7 +90,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("players")
                     && arg.matchesPrefix("to", "players")) {
                 scriptEntry.addObject("players", arg.asType(ListTag.class).filter(PlayerTag.class, scriptEntry));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/StatisticCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/StatisticCommand.java
index b5f86f3160..aa8c150b06 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/StatisticCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/StatisticCommand.java
@@ -74,7 +74,7 @@ public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         boolean specified_players = false;
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("action")
                     && arg.matchesEnum(Action.values())) {
                 scriptEntry.addObject("action", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/TeamCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/TeamCommand.java
index 7c765ca88a..0d15e0c032 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/TeamCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/TeamCommand.java
@@ -70,7 +70,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
         String name = null;
         String prefix = null;
         String suffix = null;
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesPrefix("id")
                     && !scriptEntry.hasObject("id")) {
                 scriptEntry.addObject("id", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ToastCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ToastCommand.java
index e03c2540bc..0987b4ca67 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ToastCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ToastCommand.java
@@ -65,7 +65,7 @@ public ToastCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("targets")
                     && arg.matchesPrefix("target", "targets", "t")
                     && arg.matchesArgumentList(PlayerTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/AnnounceCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/AnnounceCommand.java
index 2ec6fc721f..f0c086196d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/AnnounceCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/AnnounceCommand.java
@@ -69,7 +69,7 @@ enum AnnounceType {ALL, TO_OPS, TO_FLAGGED, TO_CONSOLE, TO_PERMISSION}
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("type")
                     && arg.matches("to_ops")) {
                 scriptEntry.addObject("type", AnnounceType.TO_OPS);
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BanCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BanCommand.java
index 969ba183ba..bdc09b495e 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BanCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BanCommand.java
@@ -94,7 +94,7 @@ public enum Actions {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (!scriptEntry.hasObject("action") && (arg.matchesPrefix("action")
                     || arg.matchesEnum(Actions.values()))) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BossBarCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BossBarCommand.java
index d33bb0fda5..761c370b29 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BossBarCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BossBarCommand.java
@@ -90,7 +90,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("title")
                     && arg.matchesPrefix("title", "t")) {
                 scriptEntry.addObject("title", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java
index b1d663dc86..fb93b6e563 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java
@@ -76,7 +76,7 @@ enum Type {AS_SERVER, AS_NPC, AS_PLAYER, AS_OP}
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matches("asplayer", "as_player")
                     && !scriptEntry.hasObject("type")) {
                 if (!Utilities.entryHasPlayer(scriptEntry)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ScoreboardCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ScoreboardCommand.java
index dd8b432856..2c9b1d65e5 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ScoreboardCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ScoreboardCommand.java
@@ -120,7 +120,7 @@ private enum Action {ADD, REMOVE}
 
     @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", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AdjustBlockCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AdjustBlockCommand.java
index 1d4cb0b4d5..11252e9b18 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AdjustBlockCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AdjustBlockCommand.java
@@ -68,7 +68,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("locations")
                     && arg.matchesArgumentList(LocationTag.class)) {
                 scriptEntry.addObject("locations", arg.asType(ListTag.class).filter(LocationTag.class, scriptEntry));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AnimateChestCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AnimateChestCommand.java
index 895b6c313e..37f83d2692 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AnimateChestCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AnimateChestCommand.java
@@ -84,7 +84,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("action")
                     && arg.matchesEnum(ChestAction.values())) {
                 scriptEntry.addObject("action", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ChunkLoadCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ChunkLoadCommand.java
index 7d74bacc43..34d9c5ee15 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ChunkLoadCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ChunkLoadCommand.java
@@ -81,7 +81,7 @@ private enum Action {ADD, REMOVE, REMOVEALL}
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesEnum(Action.values())
                     && !scriptEntry.hasObject("action")) {
                 scriptEntry.addObject("action", new ElementTag(arg.getValue().toUpperCase()));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CopyBlockCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CopyBlockCommand.java
index f408b27ddc..87308df16a 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CopyBlockCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CopyBlockCommand.java
@@ -53,7 +53,7 @@ public CopyBlockCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (arg.matchesArgumentType(LocationTag.class)
                     && !scriptEntry.hasObject("location")
                     && !arg.matchesPrefix("t", "to")) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CreateWorldCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CreateWorldCommand.java
index 6a8d2278f4..4965de4405 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CreateWorldCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/CreateWorldCommand.java
@@ -96,7 +96,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("generator")
                     && arg.matchesPrefix("generator", "g")) {
                 scriptEntry.addObject("generator", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/DropCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/DropCommand.java
index db0309acb2..57555ffc34 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/DropCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/DropCommand.java
@@ -88,7 +88,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("action")
                     && arg.matches("experience", "exp", "xp")) {
                 scriptEntry.addObject("action", new ElementTag(Action.DROP_EXP.toString()).setPrefix("action"));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ExplodeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ExplodeCommand.java
index a57cf38815..d7af358214 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ExplodeCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ExplodeCommand.java
@@ -76,7 +76,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("location")
                     && arg.matchesArgumentType(LocationTag.class)) {
                 scriptEntry.addObject("location", arg.asType(LocationTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/FireworkCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/FireworkCommand.java
index da26cd2469..7b34da39fa 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/FireworkCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/FireworkCommand.java
@@ -85,7 +85,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("location")
                     && arg.matchesArgumentType(LocationTag.class)) {
                 scriptEntry.addObject("location", arg.asType(LocationTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/GameRuleCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/GameRuleCommand.java
index 24ee39eb6b..dd3552a5e6 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/GameRuleCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/GameRuleCommand.java
@@ -43,7 +43,7 @@ public GameRuleCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("world")
                     && arg.matchesArgumentType(WorldTag.class)) {
                 scriptEntry.addObject("world", arg.asType(WorldTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/LightCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/LightCommand.java
index de1cd75723..78cc52356d 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/LightCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/LightCommand.java
@@ -68,7 +68,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("location")
                     && arg.matchesArgumentType(LocationTag.class)) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/MidiCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/MidiCommand.java
index 0c2c546208..4b05704b13 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/MidiCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/MidiCommand.java
@@ -66,7 +66,7 @@ public MidiCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("cancel")
                     && (arg.matches("cancel") || arg.matches("stop"))) {
                 scriptEntry.addObject("cancel", "");
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java
index f99753953a..bda8c4f674 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java
@@ -120,7 +120,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.matchesArgumentType(CuboidTag.class)
                     && !scriptEntry.hasObject("locations")
                     && !scriptEntry.hasObject("location_list")
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java
index 4575bc1f01..e21bd479ac 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlayEffectCommand.java
@@ -106,7 +106,7 @@ public void addCustomTabCompletions(String arg, Consumer<String> addOne) {
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
         ParticleHelper particleHelper = NMSHandler.getParticleHelper();
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("location")
                     && arg.matchesArgumentList(LocationTag.class)
                     && (arg.matchesPrefix("at") || !arg.hasPrefix())) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java
index 1b1d667a1a..b2e2fb9d12 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/PlaySoundCommand.java
@@ -80,7 +80,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("locations")
                     && arg.matchesArgumentList(LocationTag.class)) {
                 scriptEntry.addObject("locations", arg.asType(ListTag.class).filter(LocationTag.class, scriptEntry));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java
index 6a4e3da54e..372e4c6372 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java
@@ -161,7 +161,7 @@ private enum Type {CREATE, LOAD, UNLOAD, ROTATE, PASTE, SAVE, FLIP_X, FLIP_Y, FL
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("type")
                     && arg.matchesEnum(Type.values())) {
                 scriptEntry.addObject("type", new ElementTag(arg.getRawValue().toUpperCase()));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SignCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SignCommand.java
index 8d479eecd4..19fbaefdf5 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SignCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SignCommand.java
@@ -77,7 +77,7 @@ private enum Type {AUTOMATIC, SIGN_POST, WALL_SIGN}
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("type")
                     && arg.matchesEnum(Type.values())) {
                 scriptEntry.addObject("type", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/StrikeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/StrikeCommand.java
index 2e71026baf..38b95a272b 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/StrikeCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/StrikeCommand.java
@@ -58,7 +58,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("location")
                     && arg.matchesArgumentType(LocationTag.class)) {
                 scriptEntry.addObject("location", arg.asType(LocationTag.class));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SwitchCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SwitchCommand.java
index aa984eff42..a37d8b5215 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SwitchCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SwitchCommand.java
@@ -94,7 +94,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("no_physics") &&
                     arg.matches("no_physics")) {
                 scriptEntry.addObject("no_physics", new ElementTag(true));
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/TimeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/TimeCommand.java
index 7297c045d0..3c9200ee2e 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/TimeCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/TimeCommand.java
@@ -80,7 +80,7 @@ private enum Type {GLOBAL, PLAYER}
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("type")
                     && arg.matchesEnum(Type.values())) {
                 scriptEntry.addObject("type", arg.asElement());
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WeatherCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WeatherCommand.java
index 67b8c5acdb..4b08200452 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WeatherCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WeatherCommand.java
@@ -82,7 +82,7 @@ private enum Value {SUNNY, STORM, THUNDER, RESET}
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
 
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
 
             if (!scriptEntry.hasObject("type")
                     && arg.matchesEnum(Type.values())) {
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WorldBorderCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WorldBorderCommand.java
index f2ac5513f2..70cc82f90a 100644
--- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WorldBorderCommand.java
+++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WorldBorderCommand.java
@@ -71,7 +71,7 @@ public WorldBorderCommand() {
 
     @Override
     public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException {
-        for (Argument arg : scriptEntry.getProcessedArgs()) {
+        for (Argument arg : scriptEntry) {
             if (!scriptEntry.hasObject("center")
                     && arg.matchesArgumentType(LocationTag.class)
                     && arg.matchesPrefix("center")) {