diff --git a/shared/util/codeql/util/FileSystem.qll b/shared/util/codeql/util/FileSystem.qll
index ea58db929c51..8eb372e0c24a 100644
--- a/shared/util/codeql/util/FileSystem.qll
+++ b/shared/util/codeql/util/FileSystem.qll
@@ -239,6 +239,12 @@ module Make<InputSig Input> {
         result = 0
       }
 
+      pragma[nomagic]
+      private Container getAChildContainer(Container c, string baseName) {
+        result = c.getAChildContainer() and
+        baseName = result.getBaseName()
+      }
+
       pragma[nomagic]
       private Container appendStep(Folder f, string relativePath, int i) {
         i = -1 and
@@ -253,10 +259,7 @@ module Make<InputSig Input> {
           else
             if comp = "."
             then result = mid
-            else (
-              result = mid.getAChildContainer() and
-              result.getBaseName() = comp
-            )
+            else result = getAChildContainer(mid, comp)
         )
       }