diff --git a/src/main/java/de/tla2b/analysis/BOperation.java b/src/main/java/de/tla2b/analysis/BOperation.java
index 591880fd6bafc0bc5a873bd7394ee17007b47dc5..486b6daf9d99066ccfdd72dda2ddf6618a2d3e37 100644
--- a/src/main/java/de/tla2b/analysis/BOperation.java
+++ b/src/main/java/de/tla2b/analysis/BOperation.java
@@ -13,10 +13,9 @@ import java.util.*;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
-public class BOperation extends BuiltInOPs implements ASTConstants,
-	ToolGlobals, TranslationGlobals {
+public class BOperation extends BuiltInOPs implements ASTConstants, ToolGlobals, TranslationGlobals {
 	private final String name;
-	private final ExprNode node;
+	private final OpApplNode node;
 	private final List<OpApplNode> existQuans;
 	private List<String> opParams;
 	private List<FormalParamNode> formalParams;
@@ -28,7 +27,7 @@ public class BOperation extends BuiltInOPs implements ASTConstants,
 	private List<OpDeclNode> anyVariables;
 	private final SpecAnalyser specAnalyser;
 
-	public BOperation(String name, ExprNode n, List<OpApplNode> existQuans, SpecAnalyser specAnalyser) {
+	public BOperation(String name, OpApplNode n, List<OpApplNode> existQuans, SpecAnalyser specAnalyser) {
 		this.name = name;
 		this.node = n;
 		this.existQuans = existQuans;
@@ -225,10 +224,9 @@ public class BOperation extends BuiltInOPs implements ASTConstants,
 	}
 
 	public SymbolNode getSymbolNode() {
-		if (node instanceof OpApplNode) {
-			OpApplNode n = ((OpApplNode) node);
-			if (n.getOperator().getKind() == UserDefinedOpKind) {
-				return ((OpApplNode) node).getOperator();
+		if (node != null) {
+			if (node.getOperator().getKind() == UserDefinedOpKind) {
+				return node.getOperator();
 			}
 		}
 		return null;
diff --git a/src/main/java/de/tla2b/translation/OperationsFinder.java b/src/main/java/de/tla2b/translation/OperationsFinder.java
index ad904ca85ea0117448fbe3488eb6ca4e70dc9e01..77f53e92ae3416fe7ee74de274b623402036cd27 100644
--- a/src/main/java/de/tla2b/translation/OperationsFinder.java
+++ b/src/main/java/de/tla2b/translation/OperationsFinder.java
@@ -92,8 +92,7 @@ public class OperationsFinder extends AbstractASTVisitor implements
 					visitExprOrOpArgNode(n.getArgs()[0]);
 				} else {
 					String oldName = currentName;
-					ArrayList<OpApplNode> oldExists = new ArrayList<>(
-						exists);
+					ArrayList<OpApplNode> oldExists = new ArrayList<>(exists);
 
 					for (int i = 0; i < n.getArgs().length; i++) {
 						exists = new ArrayList<>(oldExists);