@@ -17,10 +17,6 @@ module Input implements InputSig<Location, DataFlowImplSpecific::CppDataFlow> {
 
   class SummarizedCallableBase = Function;
 
-  class SourceBase = Function;
-
-  class SinkBase = Function;
-
   class FlowSummaryCallBase = CallInstruction;
 
   predicate callableFromSource(SummarizedCallableBase c) { exists(c.getBlock()) }
@@ -232,7 +228,7 @@ private module Input2 implements Impl::Private::InputSig2 {
 
   bindingset[source, sc]
   SourceSinkReportingElement getASourceReportingElement(
-    Input::SourceBase source, Impl::Private::SummaryComponent sc
+    Input::SummarizedCallableBase source, Impl::Private::SummaryComponent sc
   ) {
     exists(Call call | call.getTarget() = source |
       sc = Impl::Private::SummaryComponent::return(_) and
@@ -312,7 +308,7 @@ private module Input2 implements Impl::Private::InputSig2 {
 
   bindingset[sink, sc]
   SourceSinkReportingElement getASinkReportingElement(
-    Input::SinkBase sink, Impl::Private::SummaryComponent sc
+    Input::SummarizedCallableBase sink, Impl::Private::SummaryComponent sc
   ) {
     exists(Call call, ArgumentPosition pos |
       call.getTarget() = sink and
@@ -525,9 +521,10 @@ private class SourceModelFunction extends Public::SourceElement instanceof Funct
   }
 
   override predicate isSource(
-    string output, string kind, Public::Provenance provenance, string model
+    string output, string kind, Public::Provenance provenance, boolean isExact, string model
   ) {
-    sourceModel(namespace, type, subtypes, name, signature, ext, output, kind, provenance, model)
+    sourceModel(namespace, type, subtypes, name, signature, ext, output, kind, provenance, model) and
+    isExact = true
   }
 }
 
@@ -544,7 +541,10 @@ private class SinkModelFunction extends Public::SinkElement instanceof Function
     this = interpretElement(namespace, type, subtypes, name, signature, ext)
   }
 
-  override predicate isSink(string input, string kind, Public::Provenance provenance, string model) {
-    sinkModel(namespace, type, subtypes, name, signature, ext, input, kind, provenance, model)
+  override predicate isSink(
+    string input, string kind, Public::Provenance provenance, boolean isExact, string model
+  ) {
+    sinkModel(namespace, type, subtypes, name, signature, ext, input, kind, provenance, model) and
+    isExact = true
   }
 }
@@ -30,14 +30,10 @@ module Input implements InputSig<Location, DataFlowImplSpecific::CsharpDataFlow>
     )
   }
 
-  class SourceBase extends Void {
+  class FlowSummaryCallBase extends Void {
     Location getLocation() { none() }
   }
 
-  class SinkBase = SourceBase;
-
-  class FlowSummaryCallBase = SourceBase;
-
   DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
     result.asSummarizedCallable() = c
   }
 
@@ -27,14 +27,10 @@ module Input implements InputSig<Location, DataFlowImplSpecific::GoDataFlow> {
 
   class SummarizedCallableBase = Callable;
 
-  class SourceBase extends Void {
+  class FlowSummaryCallBase extends Void {
     Location getLocation() { none() }
   }
 
-  class SinkBase = SourceBase;
-
-  class FlowSummaryCallBase = SourceBase;
-
   predicate callableFromSource(SummarizedCallableBase c) { exists(c.getFuncDef()) }
 
   DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
 
@@ -37,14 +37,10 @@ module Input implements InputSig<Location, DataFlowImplSpecific::JavaDataFlow> {
     sc.asCallable() = any(Callable c | c.fromSource() and not c.isStub())
   }
 
-  class SourceBase extends Void {
+  class FlowSummaryCallBase extends Void {
     Location getLocation() { none() }
   }
 
-  class SinkBase = SourceBase;
-
-  class FlowSummaryCallBase = SourceBase;
-
   DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
     result.asSummarizedCallable() = c
   }
 
@@ -24,14 +24,10 @@ class SummarizedCallableBase extends string {
   Location getLocation() { none() }
 }
 
-class SourceBase extends Void {
+class FlowSummaryCallBase extends Void {
   Location getLocation() { none() }
 }
 
-class SinkBase = SourceBase;
-
-class FlowSummaryCallBase = SourceBase;
-
 DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
   result.asLibraryCallable() = c
 }
 
@@ -21,14 +21,10 @@ module Input implements InputSig<Location, DataFlowImplSpecific::PythonDataFlow>
     Location getLocation() { none() }
   }
 
-  class SourceBase extends Void {
+  class FlowSummaryCallBase extends Void {
     Location getLocation() { none() }
   }
 
-  class SinkBase = SourceBase;
-
-  class FlowSummaryCallBase = SourceBase;
-
   predicate callableFromSource(SummarizedCallableBase c) { none() }
 
   DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
 
@@ -20,14 +20,10 @@ module Input implements InputSig<Location, DataFlowImplSpecific::RubyDataFlow> {
     Location getLocation() { result instanceof EmptyLocation }
   }
 
-  class SourceBase extends Void {
+  class FlowSummaryCallBase extends Void {
     Location getLocation() { none() }
   }
 
-  class SinkBase = SourceBase;
-
-  class FlowSummaryCallBase = SourceBase;
-
   predicate callableFromSource(SummarizedCallableBase c) { none() }
 
   DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {
 
@@ -44,9 +44,9 @@ module FlowBarrier {
     Range() { any() }
 
     override predicate isBarrier(
-      string output, string kind, Impl::Public::Provenance provenance, string model
+      string output, string kind, Impl::Public::Provenance provenance, boolean isExact, string model
     ) {
-      this.isBarrier(output, kind) and provenance = "manual" and model = ""
+      this.isBarrier(output, kind) and provenance = "manual" and isExact = true and model = ""
     }
 
     /**
@@ -67,9 +67,13 @@ module FlowBarrierGuard {
     Range() { any() }
 
     override predicate isBarrierGuard(
-      string input, string branch, string kind, Impl::Public::Provenance provenance, string model
+      string input, string branch, string kind, Impl::Public::Provenance provenance,
+      boolean isExact, string model
     ) {
-      this.isBarrierGuard(input, branch, kind) and provenance = "manual" and model = ""
+      this.isBarrierGuard(input, branch, kind) and
+      provenance = "manual" and
+      isExact = true and
+      model = ""
     }
 
     /**
 
@@ -36,9 +36,9 @@ module FlowSink {
     Range() { any() }
 
     override predicate isSink(
-      string input, string kind, Impl::Public::Provenance provenance, string model
+      string input, string kind, Impl::Public::Provenance provenance, boolean isExact, string model
     ) {
-      this.isSink(input, kind) and provenance = "manual" and model = ""
+      this.isSink(input, kind) and provenance = "manual" and isExact = true and model = ""
     }
 
     /**
 
@@ -42,9 +42,9 @@ module FlowSource {
     Range() { any() }
 
     override predicate isSource(
-      string output, string kind, Impl::Public::Provenance provenance, string model
+      string output, string kind, Impl::Public::Provenance provenance, boolean isExact, string model
     ) {
-      this.isSource(output, kind) and provenance = "manual" and model = ""
+      this.isSource(output, kind) and provenance = "manual" and isExact = true and model = ""
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,10 @@ module Input implements InputSig<Location, DataFlowImplSpecific::CsharpDataFlow>`
`30`	`30`	`)`
`31`	`31`	`}`
`32`	`32`
`33`		`- class SourceBase extends Void {`
	`33`	`+ class FlowSummaryCallBase extends Void {`
`34`	`34`	`Location getLocation() { none() }`
`35`	`35`	`}`
`36`	`36`
`37`		`- class SinkBase = SourceBase;`
`38`		`-`
`39`		`- class FlowSummaryCallBase = SourceBase;`
`40`		`-`
`41`	`37`	`DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {`
`42`	`38`	`result.asSummarizedCallable() = c`
`43`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,10 @@ module Input implements InputSig<Location, DataFlowImplSpecific::JavaDataFlow> {`
`37`	`37`	`sc.asCallable() = any(Callable c \| c.fromSource() and not c.isStub())`
`38`	`38`	`}`
`39`	`39`
`40`		`- class SourceBase extends Void {`
	`40`	`+ class FlowSummaryCallBase extends Void {`
`41`	`41`	`Location getLocation() { none() }`
`42`	`42`	`}`
`43`	`43`
`44`		`- class SinkBase = SourceBase;`
`45`		`-`
`46`		`- class FlowSummaryCallBase = SourceBase;`
`47`		`-`
`48`	`44`	`DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {`
`49`	`45`	`result.asSummarizedCallable() = c`
`50`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,10 @@ class SummarizedCallableBase extends string {`
`24`	`24`	`Location getLocation() { none() }`
`25`	`25`	`}`
`26`	`26`
`27`		`-class SourceBase extends Void {`
	`27`	`+class FlowSummaryCallBase extends Void {`
`28`	`28`	`Location getLocation() { none() }`
`29`	`29`	`}`
`30`	`30`
`31`		`-class SinkBase = SourceBase;`
`32`		`-`
`33`		`-class FlowSummaryCallBase = SourceBase;`
`34`		`-`
`35`	`31`	`DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {`
`36`	`32`	`result.asLibraryCallable() = c`
`37`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,10 @@ module Input implements InputSig<Location, DataFlowImplSpecific::PythonDataFlow>`
`21`	`21`	`Location getLocation() { none() }`
`22`	`22`	`}`
`23`	`23`
`24`		`- class SourceBase extends Void {`
	`24`	`+ class FlowSummaryCallBase extends Void {`
`25`	`25`	`Location getLocation() { none() }`
`26`	`26`	`}`
`27`	`27`
`28`		`- class SinkBase = SourceBase;`
`29`		`-`
`30`		`- class FlowSummaryCallBase = SourceBase;`
`31`		`-`
`32`	`28`	`predicate callableFromSource(SummarizedCallableBase c) { none() }`
`33`	`29`
`34`	`30`	`DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {`
Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,10 @@ module Input implements InputSig<Location, DataFlowImplSpecific::RubyDataFlow> {`
`20`	`20`	`Location getLocation() { result instanceof EmptyLocation }`
`21`	`21`	`}`
`22`	`22`
`23`		`- class SourceBase extends Void {`
	`23`	`+ class FlowSummaryCallBase extends Void {`
`24`	`24`	`Location getLocation() { none() }`
`25`	`25`	`}`
`26`	`26`
`27`		`- class SinkBase = SourceBase;`
`28`		`-`
`29`		`- class FlowSummaryCallBase = SourceBase;`
`30`		`-`
`31`	`27`	`predicate callableFromSource(SummarizedCallableBase c) { none() }`
`32`	`28`
`33`	`29`	`DataFlowCallable getSummarizedCallableAsDataFlowCallable(SummarizedCallableBase c) {`