diff --git a/go/ql/lib/semmle/go/AST.qll b/go/ql/lib/semmle/go/AST.qll
index bbe93ed345b..a0715f6ca0e 100644
--- a/go/ql/lib/semmle/go/AST.qll
+++ b/go/ql/lib/semmle/go/AST.qll
@@ -1,7 +1,7 @@
 /**
  * Provides classes for working with AST nodes.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Architectures.qll b/go/ql/lib/semmle/go/Architectures.qll
index b90501a5d36..0daef5147b4 100644
--- a/go/ql/lib/semmle/go/Architectures.qll
+++ b/go/ql/lib/semmle/go/Architectures.qll
@@ -1,5 +1,5 @@
 /** Provides classes for working with architectures. */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Comments.qll b/go/ql/lib/semmle/go/Comments.qll
index f232d4b9378..08a0fabc1ca 100644
--- a/go/ql/lib/semmle/go/Comments.qll
+++ b/go/ql/lib/semmle/go/Comments.qll
@@ -1,7 +1,7 @@
 /**
  * Provides classes for working with code comments.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Decls.qll b/go/ql/lib/semmle/go/Decls.qll
index d3282b59f69..7588ab913be 100644
--- a/go/ql/lib/semmle/go/Decls.qll
+++ b/go/ql/lib/semmle/go/Decls.qll
@@ -1,7 +1,7 @@
 /**
  * Provides classes for working with declarations.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/DiagnosticsReporting.qll b/go/ql/lib/semmle/go/DiagnosticsReporting.qll
index 0cbc98cdd83..c7d0b547a86 100644
--- a/go/ql/lib/semmle/go/DiagnosticsReporting.qll
+++ b/go/ql/lib/semmle/go/DiagnosticsReporting.qll
@@ -1,5 +1,5 @@
 /** Provides classes for working with errors and warnings recorded during extraction. */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Errors.qll b/go/ql/lib/semmle/go/Errors.qll
index 54e1ea98863..4ea0ed2c015 100644
--- a/go/ql/lib/semmle/go/Errors.qll
+++ b/go/ql/lib/semmle/go/Errors.qll
@@ -1,5 +1,5 @@
 /** Provides classes for working with Go frontend errors recorded during extraction. */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Expr.qll b/go/ql/lib/semmle/go/Expr.qll
index 9e006aed54c..0dcc707b19d 100644
--- a/go/ql/lib/semmle/go/Expr.qll
+++ b/go/ql/lib/semmle/go/Expr.qll
@@ -1,7 +1,7 @@
 /**
  * Provides classes for working with expressions.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Files.qll b/go/ql/lib/semmle/go/Files.qll
index 8252357bcc2..ab4e2e084ed 100644
--- a/go/ql/lib/semmle/go/Files.qll
+++ b/go/ql/lib/semmle/go/Files.qll
@@ -1,5 +1,5 @@
 /** Provides classes for working with files and folders. */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/GoMod.qll b/go/ql/lib/semmle/go/GoMod.qll
index e357ae616cf..6a899cd1d60 100644
--- a/go/ql/lib/semmle/go/GoMod.qll
+++ b/go/ql/lib/semmle/go/GoMod.qll
@@ -1,7 +1,7 @@
 /**
  * Provides classes for working with go.mod files.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/HTML.qll b/go/ql/lib/semmle/go/HTML.qll
index 41bb47e0ba5..01f8a069fe9 100644
--- a/go/ql/lib/semmle/go/HTML.qll
+++ b/go/ql/lib/semmle/go/HTML.qll
@@ -1,5 +1,5 @@
 /** Provides classes for working with HTML documents. */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Locations.qll b/go/ql/lib/semmle/go/Locations.qll
index 03105fbdf25..da55799e6df 100644
--- a/go/ql/lib/semmle/go/Locations.qll
+++ b/go/ql/lib/semmle/go/Locations.qll
@@ -1,5 +1,5 @@
 /** Provides classes for working with locations and program elements that have locations. */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Packages.qll b/go/ql/lib/semmle/go/Packages.qll
index 8926d0e17f1..f37ddb0507e 100644
--- a/go/ql/lib/semmle/go/Packages.qll
+++ b/go/ql/lib/semmle/go/Packages.qll
@@ -1,7 +1,7 @@
 /**
  * Provides classes for working with packages.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/PrintAst.qll b/go/ql/lib/semmle/go/PrintAst.qll
index c7c9bb5b4b7..6ea5fcc3971 100644
--- a/go/ql/lib/semmle/go/PrintAst.qll
+++ b/go/ql/lib/semmle/go/PrintAst.qll
@@ -1,7 +1,7 @@
 /**
  * Provides queries to pretty-print a Go AST as a graph.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
index 1933c33230c..4e9a13c8ea1 100644
--- a/go/ql/lib/semmle/go/Scopes.qll
+++ b/go/ql/lib/semmle/go/Scopes.qll
@@ -1,7 +1,7 @@
 /**
  * Provides classes for working with scopes and declared objects.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Stmt.qll b/go/ql/lib/semmle/go/Stmt.qll
index befc60e73c6..aa6fe7c24de 100644
--- a/go/ql/lib/semmle/go/Stmt.qll
+++ b/go/ql/lib/semmle/go/Stmt.qll
@@ -1,7 +1,7 @@
 /**
  * Provides classes for working with statements.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index cd4d5a4120f..574d7568543 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -1,7 +1,7 @@
 /**
  * Provides classes for working with Go types.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/Util.qll b/go/ql/lib/semmle/go/Util.qll
index 4879cb0cbe7..a6fe2a6b2b5 100644
--- a/go/ql/lib/semmle/go/Util.qll
+++ b/go/ql/lib/semmle/go/Util.qll
@@ -1,5 +1,5 @@
 /** This module provides general utility classes and predicates. */
-overlay[local?]
+overlay[local]
 module;
 
 /**
diff --git a/go/ql/lib/semmle/go/VariableWithFields.qll b/go/ql/lib/semmle/go/VariableWithFields.qll
index 920c4313de4..277a7dcc326 100644
--- a/go/ql/lib/semmle/go/VariableWithFields.qll
+++ b/go/ql/lib/semmle/go/VariableWithFields.qll
@@ -1,5 +1,5 @@
 /** Provides the `VariableWithFields` class, for working with variables with a chain of field or element accesses chained to it. */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/concepts/GeneratedFile.qll b/go/ql/lib/semmle/go/concepts/GeneratedFile.qll
index 575ede7fdee..683a8be7e05 100644
--- a/go/ql/lib/semmle/go/concepts/GeneratedFile.qll
+++ b/go/ql/lib/semmle/go/concepts/GeneratedFile.qll
@@ -1,5 +1,5 @@
 /** Provides a class for generated files. */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/controlflow/BasicBlocks.qll b/go/ql/lib/semmle/go/controlflow/BasicBlocks.qll
index cc1b0c6292c..dc52abb25ab 100644
--- a/go/ql/lib/semmle/go/controlflow/BasicBlocks.qll
+++ b/go/ql/lib/semmle/go/controlflow/BasicBlocks.qll
@@ -1,7 +1,7 @@
 /**
  * Provides classes for working with basic blocks.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll b/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll
index c7dbe776a8e..77bb94d89f8 100644
--- a/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll
+++ b/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll
@@ -1,7 +1,7 @@
 /**
  * Provides classes for working with a CFG-based program representation.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll b/go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll
index 125ad7fdec2..a26ab3adaf5 100644
--- a/go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll
+++ b/go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll
@@ -3,7 +3,7 @@
  *
  * Provides predicates for building intra-procedural CFGs.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/controlflow/IR.qll b/go/ql/lib/semmle/go/controlflow/IR.qll
index e3ed7cadbad..a4c73004108 100644
--- a/go/ql/lib/semmle/go/controlflow/IR.qll
+++ b/go/ql/lib/semmle/go/controlflow/IR.qll
@@ -9,7 +9,7 @@
  * Each instruction is also a control-flow node, but there are control-flow nodes that are not
  * instructions (synthetic entry and exit nodes, as well as no-op skip nodes).
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/dataflow/FunctionInputsAndOutputs.qll b/go/ql/lib/semmle/go/dataflow/FunctionInputsAndOutputs.qll
index 42d17006d64..5f437f81576 100644
--- a/go/ql/lib/semmle/go/dataflow/FunctionInputsAndOutputs.qll
+++ b/go/ql/lib/semmle/go/dataflow/FunctionInputsAndOutputs.qll
@@ -2,7 +2,7 @@
  * Provides QL classes for indicating data flow through a function parameter, return value,
  * or receiver.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/dataflow/GlobalValueNumbering.qll b/go/ql/lib/semmle/go/dataflow/GlobalValueNumbering.qll
index 0b08d5a4b8f..88a659f6f82 100644
--- a/go/ql/lib/semmle/go/dataflow/GlobalValueNumbering.qll
+++ b/go/ql/lib/semmle/go/dataflow/GlobalValueNumbering.qll
@@ -29,7 +29,7 @@
  * common reason for this is that the analysis cannot prove that there
  * are no side-effects that might cause the computed value to change.
  */
-overlay[local?]
+overlay[local]
 module;
 
 /*
diff --git a/go/ql/lib/semmle/go/dataflow/Properties.qll b/go/ql/lib/semmle/go/dataflow/Properties.qll
index 6794eee5fcd..573b001a3c3 100644
--- a/go/ql/lib/semmle/go/dataflow/Properties.qll
+++ b/go/ql/lib/semmle/go/dataflow/Properties.qll
@@ -1,7 +1,7 @@
 /**
  * Provides a class for representing and reasoning about properties of data-flow nodes.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/dataflow/SSA.qll b/go/ql/lib/semmle/go/dataflow/SSA.qll
index c3d759a70fe..46ce4da3935 100644
--- a/go/ql/lib/semmle/go/dataflow/SSA.qll
+++ b/go/ql/lib/semmle/go/dataflow/SSA.qll
@@ -1,7 +1,7 @@
 /**
  * Provides classes for working with static single assignment form (SSA).
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go
diff --git a/go/ql/lib/semmle/go/dataflow/SsaImpl.qll b/go/ql/lib/semmle/go/dataflow/SsaImpl.qll
index bf530108d4b..9648335a6dd 100644
--- a/go/ql/lib/semmle/go/dataflow/SsaImpl.qll
+++ b/go/ql/lib/semmle/go/dataflow/SsaImpl.qll
@@ -3,7 +3,7 @@
  *
  * Provides predicates for constructing an SSA representation for functions.
  */
-overlay[local?]
+overlay[local]
 module;
 
 import go