@@ -82,7 +82,7 @@ module Private {
       result = this.getSummaryNode().getSummarizedCallable()
     }
 
-    override Location getLocation() { result = this.getSummarizedCallable().getLocation() }
+    override Location getLocation() { result = this.getSummaryNode().getLocation() }
 
     override string toString() { result = this.getSummaryNode().toString() }
 
 
@@ -153,8 +153,7 @@ predicate jumpStep(Node n1, Node n2) {
     n2 = recvRead
   )
   or
-  FlowSummaryImpl::Private::Steps::summaryJumpStep(n1.(FlowSummaryNode).getSummaryNode(),
-    n2.(FlowSummaryNode).getSummaryNode())
+  FlowSummaryImpl::Private::Steps::summaryJumpStep(n1, n2)
 }
 
 /**
 
@@ -141,8 +141,7 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {
   any(FunctionModel m).flowStep(nodeFrom, nodeTo) and
   model = "FunctionModel"
   or
-  FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,
-    nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)
+  FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model)
 }
 
 /**
 
@@ -27,14 +27,20 @@ module Input implements InputSig<Location, DataFlowImplSpecific::GoDataFlow> {
 
   class SummarizedCallableBase = Callable;
 
-  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) { exists(c.getFuncDef()) }
 
+  DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
+    result.asSummarizedCallable() = c
+  }
+
   predicate neutralElement(
     Input::SummarizedCallableBase c, string kind, string provenance, boolean isExact
   ) {
@@ -114,23 +120,29 @@ module Input implements InputSig<Location, DataFlowImplSpecific::GoDataFlow> {
 
 private import Make<Location, DataFlowImplSpecific::GoDataFlow, 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
+
+  class SourceSinkReportingElement extends Void {
+    Location getLocation() { none() }
+
+    DataFlowCallable getEnclosingCallable() { none() }
+
+    SourceSinkReportingElement getASuccessor(Impl::Private::SummaryComponent sc) { none() }
   }
+}
+
+private import Impl::Private::Make2<Input2> as Impl2
+
+private module StepsInput implements Impl2::StepsInputSig {
+  Impl2::SummaryNode getSummaryNode(Node n) { result = n.(FlowSummaryNode).getSummaryNode() }
 
   DataFlowCall getACall(Public::SummarizedCallable sc) {
     exists(DataFlow::CallNode call |
       call.asExpr() = result and
       call.getACalleeIncludingExternals() = sc
     )
   }
-
-  DataFlowCallable getSourceNodeEnclosingCallable(Input::SourceBase source) { none() }
-
-  Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) { none() }
-
-  Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) { none() }
 }
 
 module SourceSinkInterpretationInput implements
@@ -500,8 +512,9 @@ private predicate parseReturn(AccessPath::AccessPathTokenBase c, int n) {
 
 module Private {
   import Impl::Private
+  import Impl2
 
-  module Steps = Impl::Private::Steps<StepsInput>;
+  module Steps = Impl2::Steps<StepsInput>;
 
   module External {
     import Impl::Private::External
 
@@ -109,8 +109,7 @@ private predicate localAdditionalForwardTaintStep(
   or
   any(AdditionalTaintStep a).step(pred, succ) and model = "AdditionalTaintStep"
   or
-  FlowSummaryImpl::Private::Steps::summaryLocalStep(pred,
-    succ.(DataFlowPrivate::FlowSummaryNode).getSummaryNode(), false, model)
+  FlowSummaryImpl::Private::Steps::summaryLocalStep(pred, succ, false, model)
 }
 
 /**
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ module Private {`
`82`	`82`	`result = this.getSummaryNode().getSummarizedCallable()`
`83`	`83`	`}`
`84`	`84`
`85`		`- override Location getLocation() { result = this.getSummarizedCallable().getLocation() }`
	`85`	`+ override Location getLocation() { result = this.getSummaryNode().getLocation() }`
`86`	`86`
`87`	`87`	`override string toString() { result = this.getSummaryNode().toString() }`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -153,8 +153,7 @@ predicate jumpStep(Node n1, Node n2) {`
`153`	`153`	`n2 = recvRead`
`154`	`154`	`)`
`155`	`155`	`or`
`156`		`- FlowSummaryImpl::Private::Steps::summaryJumpStep(n1.(FlowSummaryNode).getSummaryNode(),`
`157`		`- n2.(FlowSummaryNode).getSummaryNode())`
	`156`	`+ FlowSummaryImpl::Private::Steps::summaryJumpStep(n1, n2)`
`158`	`157`	`}`
`159`	`158`
`160`	`159`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,7 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {`
`141`	`141`	`any(FunctionModel m).flowStep(nodeFrom, nodeTo) and`
`142`	`142`	`model = "FunctionModel"`
`143`	`143`	`or`
`144`		`- FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom,`
`145`		`- nodeTo.(FlowSummaryNode).getSummaryNode(), true, model)`
	`144`	`+ FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom, nodeTo, true, model)`
`146`	`145`	`}`
`147`	`146`
`148`	`147`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,7 @@ private predicate localAdditionalForwardTaintStep(`
`109`	`109`	`or`
`110`	`110`	`any(AdditionalTaintStep a).step(pred, succ) and model = "AdditionalTaintStep"`
`111`	`111`	`or`
`112`		`- FlowSummaryImpl::Private::Steps::summaryLocalStep(pred,`
`113`		`- succ.(DataFlowPrivate::FlowSummaryNode).getSummaryNode(), false, model)`
	`112`	`+ FlowSummaryImpl::Private::Steps::summaryLocalStep(pred, succ, false, model)`
`114`	`113`	`}`
`115`	`114`
`116`	`115`	`/**`