diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghpatexpress/OperandValue.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghpatexpress/OperandValue.java
index 8f1d3abafe..63fce1db89 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghpatexpress/OperandValue.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghpatexpress/OperandValue.java
@@ -15,6 +15,10 @@
  */
 package ghidra.pcodeCPort.slghpatexpress;
 
+import java.io.PrintStream;
+
+import org.jdom.Element;
+
 import generic.stl.VectorSTL;
 import ghidra.pcodeCPort.context.*;
 import ghidra.pcodeCPort.sleighbase.SleighBase;
@@ -24,10 +28,6 @@ import ghidra.pcodeCPort.utils.MutableInt;
 import ghidra.pcodeCPort.utils.XmlUtils;
 import ghidra.sleigh.grammar.Location;
 
-import java.io.PrintStream;
-
-import org.jdom.Element;
-
 public class OperandValue extends PatternValue {
 
 	private int index; // This is the defining field of expression
@@ -49,8 +49,9 @@ public class OperandValue extends PatternValue {
 
 	@Override
 	public TokenPattern genMinPattern(VectorSTL<TokenPattern> ops) {
-		if (index >= ops.size())
+		if (index >= ops.size()) {
 			return null;
+		}
 		return ops.get(index);
 	}
 
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghsymbol/Constructor.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghsymbol/Constructor.java
index 912e87d7a7..e112015062 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghsymbol/Constructor.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slghsymbol/Constructor.java
@@ -543,8 +543,9 @@ public class Constructor {
 			}
 			else if (defexp != null) {
 				TokenPattern tmppat = defexp.genMinPattern(oppattern);
-				if (null == tmppat)
-				    throw new SleighError("operand " + sym.getName() + " has an issue", location);
+				if (null == tmppat) {
+					throw new SleighError("operand " + sym.getName() + " has an issue", location);
+				}
 				oppattern.push_back(tmppat);
 			}
 			else {
@@ -573,8 +574,9 @@ public class Constructor {
 		// in bytes
 
 		OperandResolve resolve = new OperandResolve(operands);
-		if (!pateq.resolveOperandLeft(resolve))
+		if (!pateq.resolveOperandLeft(resolve)) {
 			throw new SleighError("Unable to resolve operand offsets", location);
+		}
 
 		// Unravel relative offsets to absolute (if possible)
 		for (int i = 0; i < operands.size(); ++i) {