diff --git a/cpp/ql/src/Likely Bugs/Leap Year/UncheckedReturnValueForTimeFunctions.ql b/cpp/ql/src/Likely Bugs/Leap Year/UncheckedReturnValueForTimeFunctions.ql
index b223080fb6b3..dcf6c007fab7 100644
--- a/cpp/ql/src/Likely Bugs/Leap Year/UncheckedReturnValueForTimeFunctions.ql	
+++ b/cpp/ql/src/Likely Bugs/Leap Year/UncheckedReturnValueForTimeFunctions.ql	
@@ -14,8 +14,69 @@
 import cpp
 import LeapYear
 
-from FunctionCall fcall, TimeConversionFunction trf, Variable var
-where
+signature module InputSig {
+  predicate isSource(ControlFlowNode n);
+
+  predicate isSink(ControlFlowNode n);
+}
+
+module ControlFlowReachability<InputSig Input> {
+  pragma[nomagic]
+  private predicate fwd(ControlFlowNode n) {
+    Input::isSource(n)
+    or
+    exists(ControlFlowNode n0 |
+      fwd(n0) and
+      n0.getASuccessor() = n
+    )
+  }
+
+  pragma[nomagic]
+  private predicate rev(ControlFlowNode n) {
+    fwd(n) and
+    (
+      Input::isSink(n)
+      or
+      exists(ControlFlowNode n1 |
+        rev(n1) and
+        n.getASuccessor() = n1
+      )
+    )
+  }
+
+  pragma[nomagic]
+  private predicate prunedSuccessor(ControlFlowNode n1, ControlFlowNode n2) {
+    rev(n1) and
+    rev(n2) and
+    n1.getASuccessor() = n2
+  }
+
+  pragma[nomagic]
+  predicate isSource(ControlFlowNode n) {
+    Input::isSource(n) and
+    rev(n)
+  }
+
+  pragma[nomagic]
+  predicate isSink(ControlFlowNode n) {
+    Input::isSink(n) and
+    rev(n)
+  }
+
+  pragma[nomagic]
+  private predicate successorPlus(ControlFlowNode n1, ControlFlowNode n2) =
+    doublyBoundedFastTC(prunedSuccessor/2, isSource/1, isSink/1)(n1, n2)
+
+  predicate flowsTo(ControlFlowNode n1, ControlFlowNode n2) {
+    successorPlus(n1, n2)
+    or
+    n1 = n2 and
+    isSource(n1) and
+    isSink(n2)
+  }
+}
+
+predicate isUnpackedTimeTypeVar(Variable var, FunctionCall fcall, TimeConversionFunction trf) {
   fcall = trf.getACallToThisFunction() and
   fcall instanceof ExprInVoidContext and
   var.getUnderlyingType() instanceof UnpackedTimeType and
@@ -29,34 +90,93 @@ where
       fcall.getAnArgument() = va and
       var.getAnAccess() = va
     )
-  ) and
-  exists(DateStructModifiedFieldAccess dsmfa, VariableAccess modifiedVarAccess |
+  )
+}
+
+predicate isModifiedFieldAccessToTimeConversionSource(
+  ControlFlowNode modifiedVarAccess, Variable var
+) {
+  exists(DateStructModifiedFieldAccess dsmfa |
+    isUnpackedTimeTypeVar(var, _, _) and
     modifiedVarAccess = var.getAnAccess() and
-    modifiedVarAccess = dsmfa.getQualifier() and
-    modifiedVarAccess = fcall.getAPredecessor*()
+    modifiedVarAccess = dsmfa.getQualifier()
+  )
+}
+
+module ModifiedFieldAccessToTimeConversionConfig implements InputSig {
+  predicate isSource(ControlFlowNode modifiedVarAccess) {
+    isModifiedFieldAccessToTimeConversionSource(modifiedVarAccess, _)
+  }
+
+  predicate isSink(ControlFlowNode fcall) { isUnpackedTimeTypeVar(_, fcall, _) }
+}
+
+module ModifiedFieldAccessToTimeConversion =
+  ControlFlowReachability<ModifiedFieldAccessToTimeConversionConfig>;
+
+module SafeTimeGatheringFunctionCallToTimeConversionFunctionCallConfig implements InputSig {
+  predicate isSource(ControlFlowNode n) {
+    n = any(SafeTimeGatheringFunction stgf).getACallToThisFunction()
+  }
+
+  predicate isSink(ControlFlowNode fcall) { ModifiedFieldAccessToTimeConversion::isSink(fcall) }
+}
+
+module SafeTimeGatheringFunctionCallToTimeConversionFunctionCall =
+  ControlFlowReachability<SafeTimeGatheringFunctionCallToTimeConversionFunctionCallConfig>;
+
+module SafeTimeGatheringFunctionCallToModifiedFieldAccessConfig implements InputSig {
+  predicate isSource(ControlFlowNode n) {
+    n = any(SafeTimeGatheringFunction stgf).getACallToThisFunction() and
+    SafeTimeGatheringFunctionCallToTimeConversionFunctionCall::isSource(n)
+  }
+
+  predicate isSink(ControlFlowNode modifiedVarAccess) {
+    ModifiedFieldAccessToTimeConversion::flowsTo(modifiedVarAccess, _)
+  }
+}
+
+module SafeTimeGatheringFunctionCallToModifiedFieldAccess =
+  ControlFlowReachability<SafeTimeGatheringFunctionCallToModifiedFieldAccessConfig>;
+
+module ModifiedMonthFieldAccessToTimeConversionConfig implements InputSig {
+  predicate isSource(ControlFlowNode n) {
+    exists(Variable var, MonthFieldAccess mfa, AssignExpr ae |
+      n = mfa and
+      isUnpackedTimeTypeVar(var, _, _) and
+      mfa.getQualifier() = var.getAnAccess() and
+      mfa.isModified() and
+      ae = mfa.getEnclosingElement() and
+      ae.getAnOperand().getValue().toInt() = 1
+    )
+  }
+
+  predicate isSink(ControlFlowNode fcall) { ModifiedFieldAccessToTimeConversion::flowsTo(_, fcall) }
+}
+
+module ModifiedMonthFieldAccessToTimeConversion =
+  ControlFlowReachability<ModifiedMonthFieldAccessToTimeConversionConfig>;
+
+from FunctionCall fcall, TimeConversionFunction trf, Variable var
+where
+  isUnpackedTimeTypeVar(var, fcall, trf) and
+  exists(VariableAccess modifiedVarAccess |
+    isModifiedFieldAccessToTimeConversionSource(modifiedVarAccess, var) and
+    ModifiedFieldAccessToTimeConversion::flowsTo(modifiedVarAccess, fcall)
   ) and
   // Remove false positives
   not (
     // Remove any instance where the predecessor is a SafeTimeGatheringFunction and no change to the data happened in between
     exists(FunctionCall pred |
-      pred = fcall.getAPredecessor*() and
-      exists(SafeTimeGatheringFunction stgf | pred = stgf.getACallToThisFunction()) and
-      not exists(DateStructModifiedFieldAccess dsmfa, VariableAccess modifiedVarAccess |
-        modifiedVarAccess = var.getAnAccess() and
-        modifiedVarAccess = dsmfa.getQualifier() and
-        modifiedVarAccess = fcall.getAPredecessor*() and
-        modifiedVarAccess = pred.getASuccessor*()
+      SafeTimeGatheringFunctionCallToTimeConversionFunctionCall::flowsTo(pred, fcall) and
+      not exists(VariableAccess modifiedVarAccess |
+        ModifiedFieldAccessToTimeConversion::flowsTo(modifiedVarAccess, fcall) and
+        SafeTimeGatheringFunctionCallToModifiedFieldAccess::flowsTo(pred, modifiedVarAccess)
       )
     )
     or
     // Remove any instance where the year is changed, but the month is set to 1 (year wrapping)
-    exists(MonthFieldAccess mfa, AssignExpr ae |
-      mfa.getQualifier() = var.getAnAccess() and
-      mfa.isModified() and
-      mfa = fcall.getAPredecessor*() and
-      ae = mfa.getEnclosingElement() and
-      ae.getAnOperand().getValue().toInt() = 1
-    )
+    ModifiedMonthFieldAccessToTimeConversion::isSink(fcall)
   )
 select fcall,
   "$@: Return value of $@ function should be verified to check for any error because variable $@ is not guaranteed to be safe.",