@@ -305,8 +305,7 @@ private module Cached {
     model = ""
     or
     // flow through a flow summary (extension of `SummaryModelCsv`)
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-      nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model)
   }
 
   /**
@@ -497,10 +496,10 @@ class FlowSummaryNode extends NodeImpl, TFlowSummaryNode {
   }
 
   override DataFlowCallable getEnclosingCallable() {
-    result.asSummarizedCallable() = this.getSummarizedCallable()
+    result = this.getSummaryNode().getEnclosingCallable()
   }
 
-  override Location getLocationImpl() { result = this.getSummarizedCallable().getLocation() }
+  override Location getLocationImpl() { result = this.getSummaryNode().getLocation() }
 
   override string toStringImpl() { result = this.getSummaryNode().toString() }
 }
@@ -1014,8 +1013,7 @@ predicate captureValueStep(Node node1, Node node2) {
 
 predicate jumpStep(Node pred, Node succ) {
   // models-as-data summarized flow
-  FlowSummaryImpl::Private::Steps::summaryJumpStep(pred.(FlowSummaryNode).getSummaryNode(),
-    succ.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryImpl::Private::Steps::summaryJumpStep(pred, succ)
 }
 
 predicate storeStep(Node node1, ContentSet c, Node node2) {
 
@@ -16,14 +16,20 @@ module Input implements InputSig<Location, DataFlowImplSpecific::SwiftDataFlow>
 
   class SummarizedCallableBase = Function;
 
-  class SourceBase = Void;
+  class SourceBase extends Void {
+    Location getLocation() { none() }
+  }
 
-  class SinkBase = Void;
+  class SinkBase = SourceBase;
 
-  class FlowSummaryCallBase = Void;
+  class FlowSummaryCallBase = SourceBase;
 
   predicate callableFromSource(SummarizedCallableBase c) { c.hasBody() }
 
+  DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
+    result.asSummarizedCallable() = c
+  }
+
   ArgumentPosition callbackSelfParameterPosition() { result instanceof ThisArgumentPosition }
 
   ReturnKind getStandardReturnValueKind() { result instanceof NormalReturnKind }
@@ -114,18 +120,24 @@ module Input implements InputSig<Location, DataFlowImplSpecific::SwiftDataFlow>
 
 private import Make<Location, DataFlowImplSpecific::SwiftDataFlow, Input> as Impl
 
-private module StepsInput implements Impl::Private::StepsInputSig {
-  Impl::Private::SummaryNode getSummaryNode(Node n) {
-    result = n.(FlowSummaryNode).getSummaryNode()
-  }
+private module Input2 implements Impl::Private::InputSig2 {
+  private import codeql.util.Void
 
-  DataFlowCall getACall(Public::SummarizedCallable sc) { result.asCall().getStaticTarget() = sc }
+  class SourceSinkReportingElement extends Void {
+    Location getLocation() { none() }
 
-  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
+    DataFlowCallable getEnclosingCallable() { none() }
 
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
+    SourceSinkReportingElement getASuccessor(Impl::Private::SummaryComponent sc) { none() }
+  }
+}
+
+private import Impl::Private::Make2<Input2> as Impl2
 
-  Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
+private module StepsInput implements Impl2::StepsInputSig {
+  Impl2::SummaryNode getSummaryNode(Node n) { result = n.(FlowSummaryNode).getSummaryNode() }
+
+  DataFlowCall getACall(Public::SummarizedCallable sc) { result.asCall().getStaticTarget() = sc }
 }
 
 module SourceSinkInterpretationInput implements
@@ -252,8 +264,9 @@ module SourceSinkInterpretationInput implements
 
 module Private {
   import Impl::Private
+  import Impl2
 
-  module Steps = Impl::Private::Steps<StepsInput>;
+  module Steps = Impl2::Steps<StepsInput>;
 
   module External {
     import Impl::Private::External
 
@@ -76,8 +76,7 @@ private module Cached {
     model = ""
     or
     // flow through a flow summary (extension of `SummaryModelCsv`)
-    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-      nodeTo.(FlowSummaryNode).getSummaryNode(), false, model)
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, false, model)
     or
     any(AdditionalTaintStep a).step(nodeFrom, nodeTo) and model = "AdditionalTaintStep"
   }
Original file line number	Diff line number	Diff line change
`@@ -305,8 +305,7 @@ private module Cached {`
`305`	`305`	`model = ""`
`306`	`306`	`or`
`307`	`307`	// flow through a flow summary (extension of `SummaryModelCsv`)
`308`		`- FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,`
`309`		`- nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)`
	`308`	`+ FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model)`
`310`	`309`	`}`
`311`	`310`
`312`	`311`	`/**`
`@@ -497,10 +496,10 @@ class FlowSummaryNode extends NodeImpl, TFlowSummaryNode {`
`497`	`496`	`}`
`498`	`497`
`499`	`498`	`override DataFlowCallable getEnclosingCallable() {`
`500`		`- result.asSummarizedCallable() = this.getSummarizedCallable()`
	`499`	`+ result = this.getSummaryNode().getEnclosingCallable()`
`501`	`500`	`}`
`502`	`501`
`503`		`- override Location getLocationImpl() { result = this.getSummarizedCallable().getLocation() }`
	`502`	`+ override Location getLocationImpl() { result = this.getSummaryNode().getLocation() }`
`504`	`503`
`505`	`504`	`override string toStringImpl() { result = this.getSummaryNode().toString() }`
`506`	`505`	`}`
`@@ -1014,8 +1013,7 @@ predicate captureValueStep(Node node1, Node node2) {`
`1014`	`1013`
`1015`	`1014`	`predicate jumpStep(Node pred, Node succ) {`
`1016`	`1015`	`// models-as-data summarized flow`
`1017`		`- FlowSummaryImpl::Private::Steps::summaryJumpStep(pred.(FlowSummaryNode).getSummaryNode(),`
`1018`		`- succ.(FlowSummaryNode).getSummaryNode())`
	`1016`	`+ FlowSummaryImpl::Private::Steps::summaryJumpStep(pred, succ)`
`1019`	`1017`	`}`
`1020`	`1018`
`1021`	`1019`	`predicate storeStep(Node node1, ContentSet c, Node node2) {`