3 files changed, 17 insertions, 3 deletions

diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java
index aaebfcc2..bf7651ad 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java
@@ -55,10 +55,15 @@ public final class FunctionalQuery<T> extends Query<T> {
         }
 
         @Override
-        protected Query<T> withDnfInternal(Dnf newDnf) {
+        protected FunctionalQuery<T> withDnfInternal(Dnf newDnf) {
                 return newDnf.asFunction(type);
         }
 
+        @Override
+        public FunctionalQuery<T> withDnf(Dnf newDnf) {
+                return (FunctionalQuery<T>) super.withDnf(newDnf);
+        }
+
         public AssignedValue<T> call(List<NodeVariable> arguments) {
                 return targetVariable -> {
                         var argumentsWithTarget = new ArrayList<Variable>(arguments.size() + 1);
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/RelationalQuery.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/RelationalQuery.java
index c1892ee1..618fb595 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/RelationalQuery.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/RelationalQuery.java
@@ -41,10 +41,15 @@ public final class RelationalQuery extends Query<Boolean> {
         }
 
         @Override
-        protected Query<Boolean> withDnfInternal(Dnf newDnf) {
+        protected RelationalQuery withDnfInternal(Dnf newDnf) {
                 return newDnf.asRelation();
         }
 
+        @Override
+        public RelationalQuery withDnf(Dnf newDnf) {
+                return (RelationalQuery) super.withDnf(newDnf);
+        }
+
         public CallLiteral call(CallPolarity polarity, List<NodeVariable> arguments) {
                 return getDnf().call(polarity, Collections.unmodifiableList(arguments));
         }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Parameter.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Parameter.java
index dbb76177..577ac6e0 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Parameter.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Parameter.java
@@ -9,11 +9,15 @@ import java.util.Objects;
 import java.util.Optional;
 
 public class Parameter {
-        public static final Parameter NODE_OUT = new Parameter(null, ParameterDirection.OUT);
+        public static final Parameter NODE_OUT = new Parameter(null);
 
         private final Class<?> dataType;
         private final ParameterDirection direction;
 
+        public Parameter(Class<?> dataType) {
+                this(dataType, ParameterDirection.OUT);
+        }
+
         public Parameter(Class<?> dataType, ParameterDirection direction) {
                 this.dataType = dataType;
                 this.direction = direction;