diff --git a/csharp/ql/consistency-queries/DataFlowConsistency.ql b/csharp/ql/consistency-queries/DataFlowConsistency.ql
index 1ee888329c7..2f34368b669 100644
--- a/csharp/ql/consistency-queries/DataFlowConsistency.ql
+++ b/csharp/ql/consistency-queries/DataFlowConsistency.ql
@@ -4,7 +4,7 @@ private import semmle.code.csharp.dataflow.internal.DataFlowImplSpecific
 private import semmle.code.csharp.dataflow.internal.TaintTrackingImplSpecific
 private import codeql.dataflow.internal.DataFlowImplConsistency
 
-private module Input implements InputSig<CsharpDataFlow> {
+private module Input implements InputSig<Location, CsharpDataFlow> {
   private import CsharpDataFlow
 
   private predicate isStaticAssignable(Assignable a) { a.(Modifiable).isStatic() }
@@ -99,4 +99,4 @@ private module Input implements InputSig<CsharpDataFlow> {
   }
 }
 
-import MakeConsistency<CsharpDataFlow, CsharpTaintTracking, Input>
+import MakeConsistency<Location, CsharpDataFlow, CsharpTaintTracking, Input>
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow.qll
index 17e698dce2d..0fc12debaa8 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow.qll
@@ -8,6 +8,6 @@ import csharp
 module DataFlow {
   private import semmle.code.csharp.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
-  import DataFlowMake<CsharpDataFlow>
+  import DataFlowMake<Location, CsharpDataFlow>
   import semmle.code.csharp.dataflow.internal.DataFlowImpl1
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking.qll
index 7243d36b05d..fb39294ed23 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking.qll
@@ -10,6 +10,6 @@ module TaintTracking {
   private import semmle.code.csharp.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.csharp.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
-  import TaintFlowMake<CsharpDataFlow, CsharpTaintTracking>
+  import TaintFlowMake<Location, CsharpDataFlow, CsharpTaintTracking>
   import semmle.code.csharp.dataflow.internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
index 4cf39afc812..09e47bdd831 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
@@ -1,3 +1,4 @@
+private import semmle.code.csharp.Location
 private import DataFlowImplSpecific
 private import codeql.dataflow.internal.DataFlowImpl
-import MakeImpl<CsharpDataFlow>
+import MakeImpl<Location, CsharpDataFlow>
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll
index 55829d7d059..72ccd3152da 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll
@@ -1,3 +1,4 @@
+private import semmle.code.csharp.Location
 private import DataFlowImplSpecific
 private import codeql.dataflow.internal.DataFlowImplCommon
-import MakeImplCommon<CsharpDataFlow>
+import MakeImplCommon<Location, CsharpDataFlow>
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplSpecific.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplSpecific.qll
index 774dc6bd86a..af104d777b8 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplSpecific.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplSpecific.qll
@@ -2,6 +2,7 @@
  * Provides C#-specific definitions for use in the data flow library.
  */
 
+private import semmle.code.csharp.Location
 private import codeql.dataflow.DataFlow
 
 module Private {
@@ -13,7 +14,7 @@ module Public {
   import DataFlowPublic
 }
 
-module CsharpDataFlow implements InputSig {
+module CsharpDataFlow implements InputSig<Location> {
   import Private
   import Public
 
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
index bf30fe5112d..20e3dd8eb7d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
@@ -58,7 +58,7 @@ class Node extends TNode {
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
-  predicate hasLocationInfo(
+  deprecated predicate hasLocationInfo(
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
     this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
index 19972a86ab6..8c76fc3d1a7 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll
@@ -12,7 +12,7 @@ private import DataFlowImplSpecific::Public
 private import semmle.code.csharp.Unification
 private import semmle.code.csharp.dataflow.internal.ExternalFlow
 
-module Input implements InputSig<DataFlowImplSpecific::CsharpDataFlow> {
+module Input implements InputSig<Location, DataFlowImplSpecific::CsharpDataFlow> {
   class SummarizedCallableBase = UnboundCallable;
 
   ArgumentPosition callbackSelfParameterPosition() { result.isDelegateSelf() }
@@ -80,7 +80,7 @@ module Input implements InputSig<DataFlowImplSpecific::CsharpDataFlow> {
   }
 }
 
-private import Make<DataFlowImplSpecific::CsharpDataFlow, Input> as Impl
+private import Make<Location, DataFlowImplSpecific::CsharpDataFlow, Input> as Impl
 
 private module TypesInput implements Impl::Private::TypesInputSig {
   DataFlowType getSyntheticGlobalType(Impl::Private::SyntheticGlobal sg) {
@@ -154,7 +154,7 @@ private module StepsInput implements Impl::Private::StepsInputSig {
 }
 
 module SourceSinkInterpretationInput implements
-  Impl::Private::External::SourceSinkInterpretationInputSig<Location>
+  Impl::Private::External::SourceSinkInterpretationInputSig
 {
   private import csharp as Cs
 
@@ -252,7 +252,7 @@ module Private {
 
   module External {
     import Impl::Private::External
-    import Impl::Private::External::SourceSinkInterpretation<Location, SourceSinkInterpretationInput>
+    import Impl::Private::External::SourceSinkInterpretation<SourceSinkInterpretationInput>
   }
 
   private module SummaryComponentInternal = Impl::Private::SummaryComponent;
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingImplSpecific.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingImplSpecific.qll
index 17a0d2c3c1a..b33d582021f 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingImplSpecific.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingImplSpecific.qll
@@ -2,9 +2,10 @@
  * Provides C#-specific definitions for use in the taint tracking library.
  */
 
+private import semmle.code.csharp.Location
 private import codeql.dataflow.TaintTracking
 private import DataFlowImplSpecific
 
-module CsharpTaintTracking implements InputSig<CsharpDataFlow> {
+module CsharpTaintTracking implements InputSig<Location, CsharpDataFlow> {
   import TaintTrackingPrivate
 }
diff --git a/csharp/ql/test/TestUtilities/InlineFlowTest.qll b/csharp/ql/test/TestUtilities/InlineFlowTest.qll
index b7d7226e812..bf7463535e1 100644
--- a/csharp/ql/test/TestUtilities/InlineFlowTest.qll
+++ b/csharp/ql/test/TestUtilities/InlineFlowTest.qll
@@ -9,7 +9,7 @@ private import semmle.code.csharp.dataflow.internal.DataFlowImplSpecific
 private import semmle.code.csharp.dataflow.internal.TaintTrackingImplSpecific
 private import internal.InlineExpectationsTestImpl
 
-private module FlowTestImpl implements InputSig<CsharpDataFlow> {
+private module FlowTestImpl implements InputSig<Location, CsharpDataFlow> {
   predicate defaultSource(DataFlow::Node source) {
     source.asExpr().(MethodCall).getTarget().getUndecoratedName() = ["Source", "Taint"]
   }
@@ -35,4 +35,4 @@ private module FlowTestImpl implements InputSig<CsharpDataFlow> {
   }
 }
 
-import InlineFlowTestMake<CsharpDataFlow, CsharpTaintTracking, Impl, FlowTestImpl>
+import InlineFlowTestMake<Location, CsharpDataFlow, CsharpTaintTracking, Impl, FlowTestImpl>