Fix test, but I don't think this fixes the underlying problem

src/main/java/net/runelite/deob/attributes/code/instructions/AALoad.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayLoad;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class AALoad extends Instruction
+public class AALoad extends Instruction implements ArrayLoad
 {
 	public AALoad(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/AAStore.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayStore;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class AAStore extends Instruction
+public class AAStore extends Instruction implements ArrayStore
 {
 	public AAStore(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/BALoad.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayLoad;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class BALoad extends Instruction
+public class BALoad extends Instruction implements ArrayLoad
 {
 	public BALoad(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/BAStore.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayStore;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class BAStore extends Instruction
+public class BAStore extends Instruction implements ArrayStore
 {
 	public BAStore(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/CALoad.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayLoad;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class CALoad extends Instruction
+public class CALoad extends Instruction implements ArrayLoad
 {
 	public CALoad(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/CAStore.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayStore;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class CAStore extends Instruction
+public class CAStore extends Instruction implements ArrayStore
 {
 	public CAStore(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/DALoad.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayLoad;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class DALoad extends Instruction
+public class DALoad extends Instruction implements ArrayLoad
 {
 	public DALoad(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/DAStore.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayStore;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class DAStore extends Instruction
+public class DAStore extends Instruction implements ArrayStore
 {
 	public DAStore(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/FALoad.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayLoad;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class FALoad extends Instruction
+public class FALoad extends Instruction implements ArrayLoad
 {
 	public FALoad(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/FAStore.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayStore;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class FAStore extends Instruction
+public class FAStore extends Instruction implements ArrayStore
 {
 	public FAStore(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/IALoad.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayLoad;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class IALoad extends Instruction
+public class IALoad extends Instruction implements ArrayLoad
 {
 	public IALoad(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/IAStore.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayStore;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class IAStore extends Instruction
+public class IAStore extends Instruction implements ArrayStore
 {
 	public IAStore(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/LALoad.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayLoad;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class LALoad extends Instruction
+public class LALoad extends Instruction implements ArrayLoad
 {
 	public LALoad(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/LAStore.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayStore;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class LAStore extends Instruction
+public class LAStore extends Instruction implements ArrayStore
 {
 	public LAStore(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/SALoad.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayLoad;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class SALoad extends Instruction
+public class SALoad extends Instruction implements ArrayLoad
 {
 	public SALoad(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/attributes/code/instructions/SAStore.java

@@ -3,12 +3,13 @@ package net.runelite.deob.attributes.code.instructions;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.InstructionType;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayStore;
 import net.runelite.deob.execution.Frame;
 import net.runelite.deob.execution.InstructionContext;
 import net.runelite.deob.execution.Stack;
 import net.runelite.deob.execution.StackContext;
 
-public class SAStore extends Instruction
+public class SAStore extends Instruction implements ArrayStore
 {
 	public SAStore(Instructions instructions, InstructionType type, int pc)
 	{

src/main/java/net/runelite/deob/deobfuscators/arithmetic/ModArith.java

@@ -1,15 +1,11 @@
 package net.runelite.deob.deobfuscators.arithmetic;
 
-import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import net.runelite.deob.ClassFile;
 import net.runelite.deob.ClassGroup;
@@ -19,6 +15,7 @@ import net.runelite.deob.Method;
 import net.runelite.deob.attributes.Code;
 import net.runelite.deob.attributes.code.Instruction;
 import net.runelite.deob.attributes.code.Instructions;
+import net.runelite.deob.attributes.code.instruction.types.ArrayStore;
 import net.runelite.deob.attributes.code.instruction.types.FieldInstruction;
 import net.runelite.deob.attributes.code.instruction.types.GetFieldInstruction;
 import net.runelite.deob.attributes.code.instruction.types.InvokeInstruction;
@@ -52,7 +49,9 @@ public class ModArith implements Deobfuscator
 		if (ctx == null || set.contains(ctx.getInstruction()))
 			return l;
 		
-		if (ctx.getInstruction() instanceof InvokeInstruction)
+		// invoke and array store pops are unrelated to each other
+		if (ctx.getInstruction() instanceof InvokeInstruction ||
+			ctx.getInstruction() instanceof ArrayStore)
 			return l;
 		
 		set.add(ctx.getInstruction());
@@ -218,9 +217,6 @@ public class ModArith implements Deobfuscator
 					boolean other = false; // check if this contains another field
 					for (InstructionContext i : l)
 					{
-						if (i.getInstruction() instanceof InvokeInstruction)
-							continue;
-						
 						if (i.getInstruction() instanceof FieldInstruction)
 						{
 							FieldInstruction fi2 = (FieldInstruction) i.getInstruction();

src/test/java/net/runelite/deob/deobfuscators/arithmetic/ModArithTest.java

@@ -124,22 +124,10 @@ public class ModArithTest
 
 		ModArith d1 = new ModArith();
 		d1.run(group);
+		d1.runOnce();
 		
-		int last = -1, cur;
+		Deobfuscator d2 = new MultiplicationDeobfuscator();
-		while ((cur = d1.runOnce()) > 0)
+		d2.run(group);
-		{
-			Deobfuscator d2 = new MultiplicationDeobfuscator();
-			d2.run(group);
-			
-			new MultiplyOneDeobfuscator().run(group);
-
-			new MultiplyZeroDeobfuscator().run(group);
-		
-			if (last == cur)
-				break;
-			
-			last = cur;
-		}
 		
 		Encryption e = d1.getEncryption();