Restrict param2return value features

java/ql/src/utils/model-generator/CaptureSummaryModels.ql

@@ -192,6 +192,10 @@ class ParameterToReturnValueTaintConfig extends TaintTracking::Configuration {
   override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
     node2.asExpr().(ConstructorCall).getAnArgument() = node1.asExpr()
   }
+
+  override DataFlow::FlowFeature getAFeature() {
+    result instanceof DataFlow::FeatureEqualSourceSinkCallContext
+  }
 }
 
 predicate paramFlowToReturnValueExists(Parameter p) {

java/ql/src/utils/model-generator/GenerateFlowModel.py

@@ -80,7 +80,7 @@ def runQuery(infoMessage, query):
         __file__), query)
     resultBqrs = os.path.join(workDir, "out.bqrs")
     cmd = ['codeql', 'query', 'run', queryFile, '--database',
-           database, '--output', resultBqrs]
+           database, '--output', resultBqrs, '--threads', '8']
 
     ret = subprocess.call(cmd)
     if ret != 0: