diff --git a/compiler/include/driver.h b/compiler/include/driver.h
index 5b7067120e8d..6014db5c2d10 100644
--- a/compiler/include/driver.h
+++ b/compiler/include/driver.h
@@ -169,6 +169,7 @@ extern bool fDriverCompilationPhase;
 extern bool fDriverMakeBinaryPhase;
 extern char driverTmpDir[FILENAME_MAX];
 // end compiler driver control flags
+extern bool fExitLeaks;
 extern bool fPrintAllCandidates;
 extern bool fPrintCallGraph;
 extern bool fPrintCallStackOnError;
@@ -322,6 +323,7 @@ extern bool fDynoScopeResolve;
 extern bool fDynoScopeProduction;
 extern bool fDynoScopeBundled;
 extern bool fDynoDebugTrace;
+extern bool fDynoDebugPrintParsedFiles;
 extern bool fDynoVerifySerialization;
 extern bool fDynoGenLib;
 extern bool fDynoGenStdLib;
diff --git a/compiler/main/driver.cpp b/compiler/main/driver.cpp
index 9e956b85245f..5becc35f3345 100644
--- a/compiler/main/driver.cpp
+++ b/compiler/main/driver.cpp
@@ -151,6 +151,7 @@ bool fDriverDoMonolithic = false;
 bool driverDebugPhaseSpecified = false;
 // Tmp dir path managed by compiler driver
 char driverTmpDir[FILENAME_MAX] = "";
+bool fExitLeaks = true;
 bool fLibraryCompile = false;
 bool fLibraryFortran = false;
 bool fLibraryMakefile = false;
@@ -375,6 +376,7 @@ bool fDynoScopeResolve = true;
 bool fDynoScopeProduction = true;
 bool fDynoScopeBundled = false;
 bool fDynoDebugTrace = false;
+bool fDynoDebugPrintParsedFiles = false;
 bool fDynoVerifySerialization = false;
 bool fDynoGenLib = false;
 bool fDynoGenStdLib = false;
@@ -1439,6 +1441,7 @@ static ArgumentDescription arg_desc[] = {
  {"driver-compilation-phase", ' ', NULL, "Run driver compilation phase (internal use flag)", "F", &fDriverCompilationPhase, NULL, setSubInvocation},
  {"driver-makebinary-phase", ' ', NULL, "Run driver makeBinary phase (internal use flag)", "F", &fDriverMakeBinaryPhase, NULL, setSubInvocation},
  {"driver-debug-phase", ' ', "<phase>", "Specify driver phase to run when debugging: compilation, makeBinary, all", "S", NULL, NULL, setDriverDebugPhase},
+ {"exit-leaks", ' ', NULL, "[Don't] leak memory on exit", "N", &fExitLeaks, NULL, NULL},
  {"gdb", ' ', NULL, "Run compiler in gdb", "F", &fRungdb, NULL, NULL},
  {"lldb", ' ', NULL, "Run compiler in lldb", "F", &fRunlldb, NULL, NULL},
  {"interprocedural-alias-analysis", ' ', NULL, "Enable [disable] interprocedural alias analysis", "n", &fNoInterproceduralAliasAnalysis, NULL, NULL},
@@ -1508,6 +1511,7 @@ static ArgumentDescription arg_desc[] = {
  {"dyno-scope-production", ' ', NULL, "Enable [disable] using both dyno and production scope resolution", "N", &fDynoScopeProduction, "CHPL_DYNO_SCOPE_PRODUCTION", NULL},
  {"dyno-scope-bundled", ' ', NULL, "Enable [disable] using dyno to scope resolve bundled modules", "N", &fDynoScopeBundled, "CHPL_DYNO_SCOPE_BUNDLED", NULL},
  {"dyno-debug-trace", ' ', NULL, "Enable [disable] debug-trace output when using dyno compiler library", "N", &fDynoDebugTrace, "CHPL_DYNO_DEBUG_TRACE", NULL},
+ {"dyno-debug-print-parsed-files", ' ', NULL, "Enable [disable] printing all files that were parsed by Dyno", "N", &fDynoDebugPrintParsedFiles, "CHPL_DYNO_DEBUG_PRINT_PARSED_FILES", NULL},
  {"dyno-break-on-hash", ' ' , NULL, "Break when query with given hash value is executed when using dyno compiler library", "X", &fDynoBreakOnHash, "CHPL_DYNO_BREAK_ON_HASH", NULL},
  {"dyno-gen-lib", ' ', "<path>", "Specify files named on the command line should be saved into a .dyno library", "P", NULL, NULL, addDynoGenLib},
  {"dyno-gen-std", ' ', NULL, "Generate a .dyno library file for the standard library", "F", &fDynoGenStdLib, NULL, setDynoGenStdLib},
diff --git a/compiler/passes/parseAndConvert.cpp b/compiler/passes/parseAndConvert.cpp
index 2a69eedf197c..6410dbce0956 100644
--- a/compiler/passes/parseAndConvert.cpp
+++ b/compiler/passes/parseAndConvert.cpp
@@ -1439,5 +1439,15 @@ void parseAndConvertUast() {
   // Revert to using the default error handler now.
   gContext->installErrorHandler(nullptr);
 
+  if (fDynoDebugPrintParsedFiles) {
+    std::set<std::string> files;
+    auto filesUstr = chpl::parsing::introspectParsedFiles(gContext);
+    for (auto ustr : filesUstr) {
+      files.insert(ustr.str());
+    }
+    for (auto file : files) {
+      fprintf(stderr, "Parsed file: %s\n", file.c_str());
+    }
+  }
   parsed = true;
 }
diff --git a/compiler/util/misc.cpp b/compiler/util/misc.cpp
index 3521eeff976f..60b580bb6a43 100644
--- a/compiler/util/misc.cpp
+++ b/compiler/util/misc.cpp
@@ -1117,7 +1117,12 @@ void clean_exit(int status) {
 
   cleanup_for_exit();
 
-  delete gContext;
+  if (fExitLeaks) {
+    // The context's destructor takes a while, and we're about to exit anyway,
+    // so deliberately leak it.
+  } else {
+    delete gContext;
+  }
   gContext = nullptr;
 
   if (gGenInfo) {
diff --git a/frontend/include/chpl/framework/query-impl.h b/frontend/include/chpl/framework/query-impl.h
index 87b310d5aaea..a763f785c54c 100644
--- a/frontend/include/chpl/framework/query-impl.h
+++ b/frontend/include/chpl/framework/query-impl.h
@@ -27,8 +27,14 @@
 #include "chpl/framework/stringify-functions.h"
 
 #ifndef CHPL_QUERY_TIMING_AND_TRACE_ENABLED
+#ifdef NDEBUG
+// release mode
+#define CHPL_QUERY_TIMING_AND_TRACE_ENABLED 0
+#else
+// debug mode
 #define CHPL_QUERY_TIMING_AND_TRACE_ENABLED 1
 #endif
+#endif
 
 /**
   This file should be included by .cpp files implementing queries.
@@ -617,7 +623,7 @@ Context::querySetterUpdateResult(
 
 #else
 
-#define QUERY_BEGIN_TIMING()
+#define QUERY_BEGIN_TIMING(context__)
 
 #endif
 
diff --git a/frontend/include/chpl/resolution/scope-queries.h b/frontend/include/chpl/resolution/scope-queries.h
index e94934141573..404a937fb731 100644
--- a/frontend/include/chpl/resolution/scope-queries.h
+++ b/frontend/include/chpl/resolution/scope-queries.h
@@ -168,9 +168,12 @@ namespace resolution {
 
   /**
     Resolve the uses and imports in a given scope.
+
+    If 'skipPrivate' is set, avoids resolving visibility statements that
+    only expose scope-private symbols. This helps avoid unnecessary work.
   */
   const ResolvedVisibilityScope*
-  resolveVisibilityStmts(Context* context, const Scope* scope);
+  resolveVisibilityStmts(Context* context, const Scope* scope, bool skipPrivate = false);
 
   /**
     Return the scope for the automatically included 'ChapelStandard' module,
diff --git a/frontend/lib/parsing/parsing-queries.cpp b/frontend/lib/parsing/parsing-queries.cpp
index 4ad8c89f9273..242aaf08d6dd 100644
--- a/frontend/lib/parsing/parsing-queries.cpp
+++ b/frontend/lib/parsing/parsing-queries.cpp
@@ -1439,9 +1439,16 @@ const uast::AttributeGroup*
 astToAttributeGroup(Context* context, const uast::AstNode* ast) {
   const uast::AttributeGroup* ret = nullptr;
   if (ast) {
+    // If we find an attribute group on the AST, return it.
+    if (auto ag = ast->attributeGroup()) return ag;
+
+    // Right now, only Variables and TupleDecls can inherit attributes
+    // from enclosing MultiDecls or TupleDecls.
+    if (!ast->isVariable() && !ast->isTupleDecl()) return nullptr;
+
+    // handle nesting: what if we're a Variable inside a MultiDecl or TupleDecl?
     auto parent = parentAst(context, ast);
-    bool done = ast->isMultiDecl() || !parent ||
-                (!parent->isTupleDecl() && !parent->isMultiDecl());
+    bool done = !parent || (!parent->isTupleDecl() && !parent->isMultiDecl());
     // recurse if not done
     return done
            ? ast->attributeGroup()
diff --git a/frontend/lib/resolution/Resolver.cpp b/frontend/lib/resolution/Resolver.cpp
index 12daa1876cba..aefceac8c1df 100644
--- a/frontend/lib/resolution/Resolver.cpp
+++ b/frontend/lib/resolution/Resolver.cpp
@@ -512,60 +512,60 @@ gatherParentClassScopesForScopeResolving(Context* context, ID classDeclId) {
 
   std::vector<const Scope*> result;
 
-  ID curId = classDeclId;
-
   bool encounteredError = false;
-  while (!curId.isEmpty() && !encounteredError) {
-    auto ast = parsing::idToAst(context, curId);
-    if (!ast) break;
-
-    auto c = ast->toClass();
-    if (!c || c->numInheritExprs() == 0) break;
-
-    const uast::AstNode* lastParentClass = nullptr;
-    for (auto inheritExpr : c->inheritExprs()) {
-      // Resolve the parent class type expression
-      ResolutionResultByPostorderID r;
-      auto visitor =
-        Resolver::createForParentClassScopeResolve(context, c, r);
-      // Parsing excludes non-identifiers as parent class expressions.
-      //
-      // Intended to avoid calling methodReceiverScopes() recursively.
-      // Uses the empty 'savecReceiverScopes' because the class expression
-      // can't be a method anyways.
-      bool ignoredMarkedGeneric = false;
-      auto ident = Class::getInheritExprIdent(inheritExpr,
-                                              ignoredMarkedGeneric);
-      visitor.resolveIdentifier(ident, visitor.savedReceiverScopes);
-
-
-      ResolvedExpression& re = r.byAst(ident);
-      if (re.toId().isEmpty()) {
-        context->error(inheritExpr, "invalid parent class expression");
+  auto ast = parsing::idToAst(context, classDeclId);
+  if (!ast) return QUERY_END(result);
+
+  auto c = ast->toClass();
+  if (!c || c->numInheritExprs() == 0) return QUERY_END(result);
+
+  const uast::AstNode* lastParentClass = nullptr;
+  ID parentClassDeclId;
+  for (auto inheritExpr : c->inheritExprs()) {
+    // Resolve the parent class type expression
+    ResolutionResultByPostorderID r;
+    auto visitor =
+      Resolver::createForParentClassScopeResolve(context, c, r);
+    // Parsing excludes non-identifiers as parent class expressions.
+    //
+    // Intended to avoid calling methodReceiverScopes() recursively.
+    // Uses the empty 'savecReceiverScopes' because the class expression
+    // can't be a method anyways.
+    bool ignoredMarkedGeneric = false;
+    auto ident = Class::getInheritExprIdent(inheritExpr,
+                                            ignoredMarkedGeneric);
+    visitor.resolveIdentifier(ident, visitor.savedReceiverScopes);
+
+
+    ResolvedExpression& re = r.byAst(ident);
+    if (re.toId().isEmpty()) {
+      context->error(inheritExpr, "invalid parent class expression");
+      encounteredError = true;
+      break;
+    } else if (parsing::idToTag(context, re.toId()) == uast::asttags::Interface) {
+      // this is an interface; ignore it for the purposes of parent scopes.
+    } else {
+      if (lastParentClass) {
+        reportInvalidMultipleInheritance(context, c, lastParentClass, inheritExpr);
         encounteredError = true;
         break;
-      } else if (parsing::idToTag(context, re.toId()) == uast::asttags::Interface) {
-        // this is an interface; ignore it for the purposes of parent scopes.
-      } else {
-        if (lastParentClass) {
-          reportInvalidMultipleInheritance(context, c, lastParentClass, inheritExpr);
-          encounteredError = true;
-          break;
-        }
-        lastParentClass = inheritExpr;
-
-        result.push_back(scopeForId(context, re.toId()));
-        curId = re.toId();
-        // keep going through the list of parent expressions. hitting
-        // another parent expression that's a class after this point
-        // will result in an error. When we're done with other parent
-        // expressions, the loop will continue to searching for the
-        // parent classes of this parent class.
       }
+      lastParentClass = inheritExpr;
+
+      result.push_back(scopeForId(context, re.toId()));
+      parentClassDeclId = re.toId();
+      // keep going through the list of parent expressions. hitting
+      // another parent expression that's a class after this point
+      // will result in an error. When we're done with other parent
+      // expressions, the loop will continue to searching for the
+      // parent classes of this parent class.
     }
+  }
 
-    // only interfaces found, no need to look for more parents.
-    if (!lastParentClass) break;
+  if (!encounteredError && !parentClassDeclId.isEmpty()) {
+    const auto& parentScopes =
+      gatherParentClassScopesForScopeResolving(context, parentClassDeclId);
+    result.insert(result.end(), parentScopes.begin(), parentScopes.end());
   }
 
   return QUERY_END(result);
@@ -2666,6 +2666,13 @@ Resolver::lookupIdentifier(const Identifier* ident,
   const Scope* scope = scopeStack.back();
   outParenlessOverloadInfo = ParenlessOverloadInfo();
 
+  if (ident->name() == USTR("super")) {
+    // Super is a keyword, and should't be looked up in scopes. Return
+    // an empty ID to indicate that this identifier points to something,
+    // but that something has a special meaning.
+    return { BorrowedIdsWithName::createWithBuiltinId() };
+  }
+
   bool resolvingCalledIdent = nearestCalledExpression() == ident;
 
   LookupConfig config = IDENTIFIER_LOOKUP_CONFIG;
@@ -2696,13 +2703,7 @@ Resolver::lookupIdentifier(const Identifier* ident,
   // and probably a few other features.
   if (!scopeResolveOnly) {
     if (notFound) {
-      // If this identifier is 'super' and we couldn't find something it refers
-      // to, it could stand for 'this.super'. But in that case, no need to
-      // issue an error.
-      if (isPotentialSuper(ident)) {
-        // We found a single ID, and it's just 'super'.
-        return { BorrowedIdsWithName::createWithBuiltinId() };
-      } else if (!resolvingCalledIdent) {
+      if (!resolvingCalledIdent) {
         auto pair = namesWithErrorsEmitted.insert(ident->name());
         if (pair.second) {
           // insertion took place so emit the error
@@ -2722,13 +2723,13 @@ Resolver::lookupIdentifier(const Identifier* ident,
 
 void Resolver::validateAndSetToId(ResolvedExpression& r,
                                   const AstNode* node,
-                                  const ID& id) {
-  r.setToId(id);
-  if (id.isEmpty()) return;
-  if (id.isFabricatedId()) return;
+                                  const ID& toId) {
+  r.setToId(toId);
+  if (toId.isEmpty()) return;
+  if (toId.isFabricatedId()) return;
 
   // Validate the newly set to ID.
-  auto idTag = parsing::idToTag(context, id);
+  auto idTag = parsing::idToTag(context, toId);
 
   // It shouldn't refer to a module unless the node is an identifier in one of
   // the places where module references are allowed (e.g. imports).
@@ -2741,7 +2742,7 @@ void Resolver::validateAndSetToId(ResolvedExpression& r,
           asttags::isDot(parentTag)) {
         // OK
       } else {
-        auto toAst = parsing::idToAst(context, id);
+        auto toAst = parsing::idToAst(context, toId);
         auto mod = toAst->toModule();
         auto parentAst = parsing::idToAst(context, parentId);
         CHPL_REPORT(context, ModuleAsVariable, node, parentAst, mod);
@@ -2750,33 +2751,32 @@ void Resolver::validateAndSetToId(ResolvedExpression& r,
   }
 
   // If we're in a nested class, it shouldn't refer to an outer class' field.
-  auto scope = scopeForId(context, id);
-  auto parentId = scope->id();
+  auto parentId =
+    Builder::astTagIndicatesNewIdScope(idTag) ? toId : toId.parentSymbolId(context);
   auto parentTag = parsing::idToTag(context, parentId);
   if (asttags::isAggregateDecl(parentTag) &&
       parentId.contains(node->id()) &&
-      parentId != id /* It's okay to refer to the record itself */) {
+      parentId != toId /* It's okay to refer to the record itself */) {
     // Referring to a field of a class that's surrounding the current node.
     // Loop upwards looking for a composite type.
-    auto searchId = parsing::idToParentId(context, node->id());
+    auto searchId = node->id().parentSymbolId(context);
     while (!searchId.isEmpty()) {
-      auto searchTag = parsing::idToTag(context, searchId);
       if (searchId == parentId) {
         // We found the aggregate type in which the to-ID is declared,
         // so there's no nested class issues.
         break;
-      } else if (asttags::isAggregateDecl(searchTag)) {
+      } else if (asttags::isAggregateDecl(parsing::idToTag(context, searchId))) {
         auto parentAst = parsing::idToAst(context, parentId);
         auto searchAst = parsing::idToAst(context, searchId);
         auto searchAD = searchAst->toAggregateDecl();
         // It's an error!
         CHPL_REPORT(context, NestedClassFieldRef, parentAst->toAggregateDecl(),
-                    searchAD, node, id);
+                    searchAD, node, toId);
         break;
       }
 
       // Move on to the surrounding ID.
-      searchId = parsing::idToParentId(context, searchId);
+      searchId = searchId.parentSymbolId(context);
     }
   }
 }
@@ -2799,19 +2799,6 @@ void Resolver::validateAndSetMostSpecific(ResolvedExpression& r,
   r.setMostSpecific(mostSpecific);
 }
 
-static bool isCalledExpression(Resolver* rv, const AstNode* ast) {
-  if (!ast) return false;
-
-  auto p = parsing::parentAst(rv->context, ast);
-  if (!p) return false;
-
-  if (auto call = p->toCall())
-    if (auto ce = call->calledExpression())
-      return ce == ast;
-
-  return false;
-}
-
 static void maybeEmitWarningsForId(Resolver* rv, QualifiedType qt,
                                    const AstNode* astMention,
                                    ID idTarget) {
@@ -2833,7 +2820,11 @@ static void maybeEmitWarningsForId(Resolver* rv, QualifiedType qt,
   if (qt.kind() == QualifiedType::PARENLESS_FUNCTION) return;
 
   bool emitUnstableAndDeprecationWarnings = true;
-  if (isCalledExpression(rv, astMention)) {
+  if (rv->nearestCalledExpression() == astMention) {
+    // Note: the above conditional assumes that the astMention is
+    // currently the thing being traversed (which is what makes
+    // nearestCalledExpression() sufficient).
+    //
     // For functions, do not warn, since call resolution will take
     // care of that.  However, if we're referring to other symbol
     // kinds, we know right now that a deprecation warning should be
diff --git a/frontend/lib/resolution/scope-queries.cpp b/frontend/lib/resolution/scope-queries.cpp
index 37bc917596d5..c0bef78255bc 100644
--- a/frontend/lib/resolution/scope-queries.cpp
+++ b/frontend/lib/resolution/scope-queries.cpp
@@ -1049,6 +1049,33 @@ static const Scope* nextHigherScope(Context* context, const Scope* scope) {
   return scope->parentScope();
 }
 
+// As a quick optimization to avoid looking up names in scopes where they
+// can't possibly be (because they're reserved), skip names like 'int' which
+// can't be redefined.
+//
+// Performance: ideally this could be a SmallPtrSet, but we're getting
+// different .c_str() pointers for USTR("int") and strings we get from the
+// parser. Seems fixable.
+//
+// Other reserved identifiers (bytes, imag) could be added here, but in
+// my performance benchmarks they didn't occur frequently so were not
+// worth the additional checking by this function. This list is not intended
+// to be complete; rather, it is intended to cover the most common cases.
+static bool isReservedIdentifier(UniqueString name) {
+  static std::unordered_set<UniqueString> reserved = {
+    USTR("bool"),
+    USTR("complex"),
+    USTR("domain"),
+    USTR("int"),
+    USTR("nil"),
+    USTR("uint"),
+    USTR("real"),
+    USTR("string"),
+    USTR("void"),
+  };
+  return reserved.count(name);
+}
+
 // appends to result
 //
 // traceCurPath and traceResult support gathering additional information
@@ -1079,6 +1106,13 @@ bool LookupHelper::doLookupInScope(const Scope* scope,
   bool includeMethods = (config & LOOKUP_METHODS) != 0;
   bool trace = (traceCurPath != nullptr && traceResult != nullptr);
 
+  // reserved (non-redefinable) identifiers will be found in the toplevel
+  // scope only.
+  if (checkParents && !onlyMethodsFields && isReservedIdentifier(name)) {
+    result.push_back(BorrowedIdsWithName::createWithBuiltinId());
+    return true;
+  }
+
   IdAndFlags::Flags curFilter = 0;
   IdAndFlags::FlagSet excludeFilter;
   if (skipPrivateVisibilities) {
@@ -2572,9 +2606,10 @@ doResolveVisibilityStmt(Context* context,
 static
 const owned<ResolvedVisibilityScope>& resolveVisibilityStmtsQuery(
                                                       Context* context,
-                                                      const Scope* scope)
+                                                      const Scope* scope,
+                                                      bool skipPrivate)
 {
-  QUERY_BEGIN(resolveVisibilityStmtsQuery, context, scope);
+  QUERY_BEGIN(resolveVisibilityStmtsQuery, context, scope, skipPrivate);
 
   owned<ResolvedVisibilityScope> result;
   const AstNode* ast = parsing::idToAst(context, scope->id());
@@ -2587,8 +2622,14 @@ const owned<ResolvedVisibilityScope>& resolveVisibilityStmtsQuery(
     std::vector<const AstNode*> usesAndImports;
     std::vector<const Require*> requireNodes;
     for (const AstNode* child : ast->children()) {
-      if (child->isUse() || child->isImport()) {
-        usesAndImports.push_back(child);
+      if (auto useNode = child->toUse()) {
+        if (!skipPrivate || useNode->visibility() == Decl::PUBLIC) {
+          usesAndImports.push_back(useNode);
+        }
+      } else if (auto importNode = child->toImport()) {
+        if (!skipPrivate || importNode->visibility() == Decl::PUBLIC) {
+          usesAndImports.push_back(importNode);
+        }
       } else if (auto req = child->toRequire()) {
         requireNodes.push_back(req);
       }
@@ -2621,21 +2662,21 @@ const owned<ResolvedVisibilityScope>& resolveVisibilityStmtsQuery(
 }
 
 const ResolvedVisibilityScope*
-resolveVisibilityStmts(Context* context, const Scope* scope) {
+resolveVisibilityStmts(Context* context, const Scope* scope, bool skipPrivate) {
   if (!scope->containsUseImport()) {
     // stop early if this scope has no use/import statements
     return nullptr;
   }
 
   if (context->isQueryRunning(resolveVisibilityStmtsQuery,
-                              std::make_tuple(scope))) {
+                              std::make_tuple(scope, skipPrivate))) {
     // ignore use/imports if we are currently resolving uses/imports
     // for this scope
     return nullptr;
   }
 
   const owned<ResolvedVisibilityScope>& o =
-    resolveVisibilityStmtsQuery(context, scope);
+    resolveVisibilityStmtsQuery(context, scope, skipPrivate);
   const ResolvedVisibilityScope* r = o.get();
 
   return r;
diff --git a/frontend/test/resolution/testSuper.cpp b/frontend/test/resolution/testSuper.cpp
index bdb20f551a66..684e32a98535 100644
--- a/frontend/test/resolution/testSuper.cpp
+++ b/frontend/test/resolution/testSuper.cpp
@@ -181,15 +181,15 @@ static void superTest6() {
               }
 
               class Child : Parent {
-                proc foo(super: owned Other) {
+                proc foo() {
                   return super.bar();
                 }
               }
             }
          )"""",
          "M.Child.foo",
-         "M.Child.foo@7",
-         "M.Other.bar");
+         "M.Child.foo@3",
+         "M.Parent.bar");
 }
 
 int main() {
diff --git a/test/separate_compilation/serialization/buildAll.compopts b/test/separate_compilation/serialization/buildAll.compopts
index 66e230c5ca8f..a3604afe8f2b 100644
--- a/test/separate_compilation/serialization/buildAll.compopts
+++ b/test/separate_compilation/serialization/buildAll.compopts
@@ -1 +1 @@
-testGenLib.dyno MyMod.dyno OtherMod.dyno chpl_standard.dyno --main-module testGenLib --dyno-debug-trace
+testGenLib.dyno MyMod.dyno OtherMod.dyno chpl_standard.dyno --main-module testGenLib --dyno-debug-print-parsed-files
diff --git a/test/separate_compilation/serialization/buildAll.good b/test/separate_compilation/serialization/buildAll.good
index 22a8d8bfa267..fa682f689843 100644
--- a/test/separate_compilation/serialization/buildAll.good
+++ b/test/separate_compilation/serialization/buildAll.good
@@ -1,3 +1,3 @@
-2 { fileTextQuery ("buildAll.chpl") 
+Parsed file: buildAll.chpl
 MYPREFIX: doMyM-doMyM-doMyM
 MYPREFIX: doMrehtO-doMrehtO-doMrehtO
diff --git a/test/separate_compilation/serialization/testGenLib.MyMod.good b/test/separate_compilation/serialization/testGenLib.MyMod.good
index 186ee3bcd169..dd87912ddb01 100644
--- a/test/separate_compilation/serialization/testGenLib.MyMod.good
+++ b/test/separate_compilation/serialization/testGenLib.MyMod.good
@@ -1,98 +1,98 @@
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelBase.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelStandard.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/PrintModuleInitOrder.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/gen/.../ChapelSysCTypes.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Errors.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelTaskData.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/startInitCommDiags.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/CString.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/Bytes.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/String.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/OwnedObject.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/SharedObject.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/Atomics.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/NetworkAtomics.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/NetworkAtomicTypes.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/AtomicsCommon.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelIteratorSupport.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelThreads.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelTuple.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelRange.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelReduce.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelSyncvar.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelTaskDataHelp.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/localeModels/flat/LocaleModel.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelLocale.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelPrivatization.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultRectangular.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocalesArray.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelArray.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelDistribution.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelAutoLocalAccess.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelIOSerialize.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelHashing.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultAssociative.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultSparse.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelTaskID.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/tasktable/off/ChapelTaskTable.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/MemTracking.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelUtil.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelSerializedBroadcast.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ExportWrappers.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelAutoAggregation.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelGpuSupport.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelContext.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelStaticVars.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/stopInitCommDiags.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelLocks.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ByteBufferHelpers.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/BytesStringCommon.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/BytesCasts.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/StringCasts.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/MemConsistency.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelDebugPrint.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocaleModelHelpFlat.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocaleModelHelpMem.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ExternalArray.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ArrayViewSlice.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ArrayViewRankChange.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ArrayViewReindex.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelDomain.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelHashtable.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelIOStringifyHelper.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocaleModelHelpRuntime.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelNumLocales.chpl") 
-2 { fileTextQuery ("testGenLib.chpl") 
-8 { fileTextQuery ("$CHPL_HOME/modules/standard/CTypes.chpl") 
-9 { fileTextQuery ("$CHPL_HOME/modules/standard/HaltWrappers.chpl") 
-8 { fileTextQuery ("$CHPL_HOME/modules/standard/ChplConfig.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/standard/CommDiagnostics.chpl") 
-8 { fileTextQuery ("$CHPL_HOME/modules/standard/OS.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/standard/WeakPointer.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/standard/Reflection.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/dists/DSIUtil.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/standard/AutoMath.chpl") 
-a { fileTextQuery ("$CHPL_HOME/modules/standard/IO.chpl") 
-b { fileTextQuery ("$CHPL_HOME/modules/standard/ChapelIO.chpl") 
-b { fileTextQuery ("$CHPL_HOME/modules/standard/Regex.chpl") 
-b { fileTextQuery ("$CHPL_HOME/modules/packages/RangeChunk.chpl") 
-c { fileTextQuery ("$CHPL_HOME/modules/standard/Math.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/packages/CopyAggregation.chpl") 
-6 { fileTextQuery ("$CHPL_HOME/modules/standard/Types.chpl") 
-7 { fileTextQuery ("OtherMod.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/packages/Sort.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/packages/Search.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Communication.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/MemMove.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/List.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Random.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/dists/BlockDist.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/packages/NPBRandom.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Time.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/layouts/LayoutCS.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/dists/SparseBlockDist.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/JSON.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Map.chpl") 
+Parsed file: $CHPL_HOME/modules/dists/BlockDist.chpl
+Parsed file: $CHPL_HOME/modules/dists/DSIUtil.chpl
+Parsed file: $CHPL_HOME/modules/dists/SparseBlockDist.chpl
+Parsed file: $CHPL_HOME/modules/internal/ArrayViewRankChange.chpl
+Parsed file: $CHPL_HOME/modules/internal/ArrayViewReindex.chpl
+Parsed file: $CHPL_HOME/modules/internal/ArrayViewSlice.chpl
+Parsed file: $CHPL_HOME/modules/internal/Atomics.chpl
+Parsed file: $CHPL_HOME/modules/internal/AtomicsCommon.chpl
+Parsed file: $CHPL_HOME/modules/internal/ByteBufferHelpers.chpl
+Parsed file: $CHPL_HOME/modules/internal/Bytes.chpl
+Parsed file: $CHPL_HOME/modules/internal/BytesCasts.chpl
+Parsed file: $CHPL_HOME/modules/internal/BytesStringCommon.chpl
+Parsed file: $CHPL_HOME/modules/internal/CString.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelArray.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelAutoAggregation.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelAutoLocalAccess.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelBase.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelContext.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelDebugPrint.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelDistribution.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelDomain.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelGpuSupport.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelHashing.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelHashtable.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelIOSerialize.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelIOStringifyHelper.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelIteratorSupport.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelLocale.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelLocks.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelNumLocales.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelPrivatization.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelRange.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelReduce.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelSerializedBroadcast.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelStandard.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelStaticVars.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelSyncvar.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelTaskData.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelTaskDataHelp.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelTaskID.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelThreads.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelTuple.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelUtil.chpl
+Parsed file: $CHPL_HOME/modules/internal/DefaultAssociative.chpl
+Parsed file: $CHPL_HOME/modules/internal/DefaultRectangular.chpl
+Parsed file: $CHPL_HOME/modules/internal/DefaultSparse.chpl
+Parsed file: $CHPL_HOME/modules/internal/ExportWrappers.chpl
+Parsed file: $CHPL_HOME/modules/internal/ExternalArray.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocaleModelHelpFlat.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocaleModelHelpMem.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocaleModelHelpRuntime.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocalesArray.chpl
+Parsed file: $CHPL_HOME/modules/internal/MemConsistency.chpl
+Parsed file: $CHPL_HOME/modules/internal/MemTracking.chpl
+Parsed file: $CHPL_HOME/modules/internal/NetworkAtomicTypes.chpl
+Parsed file: $CHPL_HOME/modules/internal/NetworkAtomics.chpl
+Parsed file: $CHPL_HOME/modules/internal/OwnedObject.chpl
+Parsed file: $CHPL_HOME/modules/internal/PrintModuleInitOrder.chpl
+Parsed file: $CHPL_HOME/modules/internal/SharedObject.chpl
+Parsed file: $CHPL_HOME/modules/internal/String.chpl
+Parsed file: $CHPL_HOME/modules/internal/StringCasts.chpl
+Parsed file: $CHPL_HOME/modules/internal/localeModels/flat/LocaleModel.chpl
+Parsed file: $CHPL_HOME/modules/internal/startInitCommDiags.chpl
+Parsed file: $CHPL_HOME/modules/internal/stopInitCommDiags.chpl
+Parsed file: $CHPL_HOME/modules/internal/tasktable/off/ChapelTaskTable.chpl
+Parsed file: $CHPL_HOME/modules/layouts/LayoutCS.chpl
+Parsed file: $CHPL_HOME/modules/packages/CopyAggregation.chpl
+Parsed file: $CHPL_HOME/modules/packages/NPBRandom.chpl
+Parsed file: $CHPL_HOME/modules/packages/RangeChunk.chpl
+Parsed file: $CHPL_HOME/modules/packages/Search.chpl
+Parsed file: $CHPL_HOME/modules/packages/Sort.chpl
+Parsed file: $CHPL_HOME/modules/standard/AutoMath.chpl
+Parsed file: $CHPL_HOME/modules/standard/CTypes.chpl
+Parsed file: $CHPL_HOME/modules/standard/ChapelIO.chpl
+Parsed file: $CHPL_HOME/modules/standard/ChplConfig.chpl
+Parsed file: $CHPL_HOME/modules/standard/CommDiagnostics.chpl
+Parsed file: $CHPL_HOME/modules/standard/Communication.chpl
+Parsed file: $CHPL_HOME/modules/standard/Errors.chpl
+Parsed file: $CHPL_HOME/modules/standard/HaltWrappers.chpl
+Parsed file: $CHPL_HOME/modules/standard/IO.chpl
+Parsed file: $CHPL_HOME/modules/standard/JSON.chpl
+Parsed file: $CHPL_HOME/modules/standard/List.chpl
+Parsed file: $CHPL_HOME/modules/standard/Map.chpl
+Parsed file: $CHPL_HOME/modules/standard/Math.chpl
+Parsed file: $CHPL_HOME/modules/standard/MemMove.chpl
+Parsed file: $CHPL_HOME/modules/standard/OS.chpl
+Parsed file: $CHPL_HOME/modules/standard/Random.chpl
+Parsed file: $CHPL_HOME/modules/standard/Reflection.chpl
+Parsed file: $CHPL_HOME/modules/standard/Regex.chpl
+Parsed file: $CHPL_HOME/modules/standard/Time.chpl
+Parsed file: $CHPL_HOME/modules/standard/Types.chpl
+Parsed file: $CHPL_HOME/modules/standard/WeakPointer.chpl
+Parsed file: $CHPL_HOME/modules/standard/gen/.../ChapelSysCTypes.chpl
+Parsed file: OtherMod.chpl
+Parsed file: testGenLib.chpl
 MYPREFIX: doMyM-doMyM-doMyM
 MYPREFIX: OtherMod OtherMod OtherMod
diff --git a/test/separate_compilation/serialization/testGenLib.OtherMod.good b/test/separate_compilation/serialization/testGenLib.OtherMod.good
index bf7bcf54c9d9..7c7b7f01bd7e 100644
--- a/test/separate_compilation/serialization/testGenLib.OtherMod.good
+++ b/test/separate_compilation/serialization/testGenLib.OtherMod.good
@@ -1,98 +1,98 @@
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelBase.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelStandard.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/PrintModuleInitOrder.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/gen/.../ChapelSysCTypes.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Errors.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelTaskData.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/startInitCommDiags.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/CString.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/Bytes.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/String.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/OwnedObject.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/SharedObject.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/Atomics.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/NetworkAtomics.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/NetworkAtomicTypes.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/AtomicsCommon.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelIteratorSupport.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelThreads.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelTuple.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelRange.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelReduce.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelSyncvar.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelTaskDataHelp.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/localeModels/flat/LocaleModel.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelLocale.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelPrivatization.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultRectangular.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocalesArray.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelArray.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelDistribution.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelAutoLocalAccess.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelIOSerialize.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelHashing.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultAssociative.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultSparse.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelTaskID.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/tasktable/off/ChapelTaskTable.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/MemTracking.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelUtil.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelSerializedBroadcast.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ExportWrappers.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelAutoAggregation.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelGpuSupport.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelContext.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelStaticVars.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/stopInitCommDiags.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelLocks.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ByteBufferHelpers.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/BytesStringCommon.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/BytesCasts.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/StringCasts.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/MemConsistency.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelDebugPrint.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocaleModelHelpFlat.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocaleModelHelpMem.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ExternalArray.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ArrayViewSlice.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ArrayViewRankChange.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ArrayViewReindex.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelDomain.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelHashtable.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelIOStringifyHelper.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocaleModelHelpRuntime.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelNumLocales.chpl") 
-2 { fileTextQuery ("testGenLib.chpl") 
-8 { fileTextQuery ("$CHPL_HOME/modules/standard/CTypes.chpl") 
-9 { fileTextQuery ("$CHPL_HOME/modules/standard/HaltWrappers.chpl") 
-8 { fileTextQuery ("$CHPL_HOME/modules/standard/ChplConfig.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/standard/CommDiagnostics.chpl") 
-8 { fileTextQuery ("$CHPL_HOME/modules/standard/OS.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/standard/WeakPointer.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/standard/Reflection.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/dists/DSIUtil.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/standard/AutoMath.chpl") 
-a { fileTextQuery ("$CHPL_HOME/modules/standard/IO.chpl") 
-b { fileTextQuery ("$CHPL_HOME/modules/standard/ChapelIO.chpl") 
-b { fileTextQuery ("$CHPL_HOME/modules/standard/Regex.chpl") 
-b { fileTextQuery ("$CHPL_HOME/modules/packages/RangeChunk.chpl") 
-c { fileTextQuery ("$CHPL_HOME/modules/standard/Math.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/packages/CopyAggregation.chpl") 
-6 { fileTextQuery ("$CHPL_HOME/modules/standard/Types.chpl") 
-7 { fileTextQuery ("MyMod.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/packages/Sort.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/packages/Search.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Communication.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/MemMove.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/List.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Random.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/dists/BlockDist.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/packages/NPBRandom.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Time.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/layouts/LayoutCS.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/dists/SparseBlockDist.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/JSON.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Map.chpl") 
+Parsed file: $CHPL_HOME/modules/dists/BlockDist.chpl
+Parsed file: $CHPL_HOME/modules/dists/DSIUtil.chpl
+Parsed file: $CHPL_HOME/modules/dists/SparseBlockDist.chpl
+Parsed file: $CHPL_HOME/modules/internal/ArrayViewRankChange.chpl
+Parsed file: $CHPL_HOME/modules/internal/ArrayViewReindex.chpl
+Parsed file: $CHPL_HOME/modules/internal/ArrayViewSlice.chpl
+Parsed file: $CHPL_HOME/modules/internal/Atomics.chpl
+Parsed file: $CHPL_HOME/modules/internal/AtomicsCommon.chpl
+Parsed file: $CHPL_HOME/modules/internal/ByteBufferHelpers.chpl
+Parsed file: $CHPL_HOME/modules/internal/Bytes.chpl
+Parsed file: $CHPL_HOME/modules/internal/BytesCasts.chpl
+Parsed file: $CHPL_HOME/modules/internal/BytesStringCommon.chpl
+Parsed file: $CHPL_HOME/modules/internal/CString.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelArray.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelAutoAggregation.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelAutoLocalAccess.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelBase.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelContext.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelDebugPrint.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelDistribution.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelDomain.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelGpuSupport.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelHashing.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelHashtable.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelIOSerialize.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelIOStringifyHelper.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelIteratorSupport.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelLocale.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelLocks.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelNumLocales.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelPrivatization.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelRange.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelReduce.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelSerializedBroadcast.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelStandard.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelStaticVars.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelSyncvar.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelTaskData.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelTaskDataHelp.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelTaskID.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelThreads.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelTuple.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelUtil.chpl
+Parsed file: $CHPL_HOME/modules/internal/DefaultAssociative.chpl
+Parsed file: $CHPL_HOME/modules/internal/DefaultRectangular.chpl
+Parsed file: $CHPL_HOME/modules/internal/DefaultSparse.chpl
+Parsed file: $CHPL_HOME/modules/internal/ExportWrappers.chpl
+Parsed file: $CHPL_HOME/modules/internal/ExternalArray.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocaleModelHelpFlat.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocaleModelHelpMem.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocaleModelHelpRuntime.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocalesArray.chpl
+Parsed file: $CHPL_HOME/modules/internal/MemConsistency.chpl
+Parsed file: $CHPL_HOME/modules/internal/MemTracking.chpl
+Parsed file: $CHPL_HOME/modules/internal/NetworkAtomicTypes.chpl
+Parsed file: $CHPL_HOME/modules/internal/NetworkAtomics.chpl
+Parsed file: $CHPL_HOME/modules/internal/OwnedObject.chpl
+Parsed file: $CHPL_HOME/modules/internal/PrintModuleInitOrder.chpl
+Parsed file: $CHPL_HOME/modules/internal/SharedObject.chpl
+Parsed file: $CHPL_HOME/modules/internal/String.chpl
+Parsed file: $CHPL_HOME/modules/internal/StringCasts.chpl
+Parsed file: $CHPL_HOME/modules/internal/localeModels/flat/LocaleModel.chpl
+Parsed file: $CHPL_HOME/modules/internal/startInitCommDiags.chpl
+Parsed file: $CHPL_HOME/modules/internal/stopInitCommDiags.chpl
+Parsed file: $CHPL_HOME/modules/internal/tasktable/off/ChapelTaskTable.chpl
+Parsed file: $CHPL_HOME/modules/layouts/LayoutCS.chpl
+Parsed file: $CHPL_HOME/modules/packages/CopyAggregation.chpl
+Parsed file: $CHPL_HOME/modules/packages/NPBRandom.chpl
+Parsed file: $CHPL_HOME/modules/packages/RangeChunk.chpl
+Parsed file: $CHPL_HOME/modules/packages/Search.chpl
+Parsed file: $CHPL_HOME/modules/packages/Sort.chpl
+Parsed file: $CHPL_HOME/modules/standard/AutoMath.chpl
+Parsed file: $CHPL_HOME/modules/standard/CTypes.chpl
+Parsed file: $CHPL_HOME/modules/standard/ChapelIO.chpl
+Parsed file: $CHPL_HOME/modules/standard/ChplConfig.chpl
+Parsed file: $CHPL_HOME/modules/standard/CommDiagnostics.chpl
+Parsed file: $CHPL_HOME/modules/standard/Communication.chpl
+Parsed file: $CHPL_HOME/modules/standard/Errors.chpl
+Parsed file: $CHPL_HOME/modules/standard/HaltWrappers.chpl
+Parsed file: $CHPL_HOME/modules/standard/IO.chpl
+Parsed file: $CHPL_HOME/modules/standard/JSON.chpl
+Parsed file: $CHPL_HOME/modules/standard/List.chpl
+Parsed file: $CHPL_HOME/modules/standard/Map.chpl
+Parsed file: $CHPL_HOME/modules/standard/Math.chpl
+Parsed file: $CHPL_HOME/modules/standard/MemMove.chpl
+Parsed file: $CHPL_HOME/modules/standard/OS.chpl
+Parsed file: $CHPL_HOME/modules/standard/Random.chpl
+Parsed file: $CHPL_HOME/modules/standard/Reflection.chpl
+Parsed file: $CHPL_HOME/modules/standard/Regex.chpl
+Parsed file: $CHPL_HOME/modules/standard/Time.chpl
+Parsed file: $CHPL_HOME/modules/standard/Types.chpl
+Parsed file: $CHPL_HOME/modules/standard/WeakPointer.chpl
+Parsed file: $CHPL_HOME/modules/standard/gen/.../ChapelSysCTypes.chpl
+Parsed file: MyMod.chpl
+Parsed file: testGenLib.chpl
 MYPREFIX: MyMod MyMod MyMod
 MYPREFIX: doMrehtO-doMrehtO-doMrehtO
diff --git a/test/separate_compilation/serialization/testGenLib.both.good b/test/separate_compilation/serialization/testGenLib.both.good
index bce860b9beaf..001b776a27ea 100644
--- a/test/separate_compilation/serialization/testGenLib.both.good
+++ b/test/separate_compilation/serialization/testGenLib.both.good
@@ -1,97 +1,97 @@
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelBase.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelStandard.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/PrintModuleInitOrder.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/gen/.../ChapelSysCTypes.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Errors.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelTaskData.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/startInitCommDiags.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/CString.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/Bytes.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/String.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/OwnedObject.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/SharedObject.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/Atomics.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/NetworkAtomics.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/NetworkAtomicTypes.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/AtomicsCommon.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelIteratorSupport.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelThreads.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelTuple.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelRange.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelReduce.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelSyncvar.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelTaskDataHelp.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/localeModels/flat/LocaleModel.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelLocale.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelPrivatization.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultRectangular.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocalesArray.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelArray.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelDistribution.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelAutoLocalAccess.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelIOSerialize.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelHashing.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultAssociative.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/DefaultSparse.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelTaskID.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/tasktable/off/ChapelTaskTable.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/MemTracking.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelUtil.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelSerializedBroadcast.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ExportWrappers.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelAutoAggregation.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelGpuSupport.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelContext.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelStaticVars.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/stopInitCommDiags.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelLocks.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ByteBufferHelpers.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/BytesStringCommon.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/BytesCasts.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/StringCasts.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/MemConsistency.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelDebugPrint.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocaleModelHelpFlat.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocaleModelHelpMem.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ExternalArray.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ArrayViewSlice.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ArrayViewRankChange.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ArrayViewReindex.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelDomain.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelHashtable.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelIOStringifyHelper.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/LocaleModelHelpRuntime.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/internal/ChapelNumLocales.chpl") 
-2 { fileTextQuery ("testGenLib.chpl") 
-8 { fileTextQuery ("$CHPL_HOME/modules/standard/CTypes.chpl") 
-9 { fileTextQuery ("$CHPL_HOME/modules/standard/HaltWrappers.chpl") 
-8 { fileTextQuery ("$CHPL_HOME/modules/standard/ChplConfig.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/standard/CommDiagnostics.chpl") 
-8 { fileTextQuery ("$CHPL_HOME/modules/standard/OS.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/standard/WeakPointer.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/standard/Reflection.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/dists/DSIUtil.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/standard/AutoMath.chpl") 
-a { fileTextQuery ("$CHPL_HOME/modules/standard/IO.chpl") 
-b { fileTextQuery ("$CHPL_HOME/modules/standard/ChapelIO.chpl") 
-b { fileTextQuery ("$CHPL_HOME/modules/standard/Regex.chpl") 
-b { fileTextQuery ("$CHPL_HOME/modules/packages/RangeChunk.chpl") 
-c { fileTextQuery ("$CHPL_HOME/modules/standard/Math.chpl") 
-7 { fileTextQuery ("$CHPL_HOME/modules/packages/CopyAggregation.chpl") 
-6 { fileTextQuery ("$CHPL_HOME/modules/standard/Types.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/packages/Sort.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/packages/Search.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Communication.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/MemMove.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/List.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Random.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/dists/BlockDist.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/packages/NPBRandom.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Time.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/layouts/LayoutCS.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/dists/SparseBlockDist.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/JSON.chpl") 
-2 { fileTextQuery ("$CHPL_HOME/modules/standard/Map.chpl") 
+Parsed file: $CHPL_HOME/modules/dists/BlockDist.chpl
+Parsed file: $CHPL_HOME/modules/dists/DSIUtil.chpl
+Parsed file: $CHPL_HOME/modules/dists/SparseBlockDist.chpl
+Parsed file: $CHPL_HOME/modules/internal/ArrayViewRankChange.chpl
+Parsed file: $CHPL_HOME/modules/internal/ArrayViewReindex.chpl
+Parsed file: $CHPL_HOME/modules/internal/ArrayViewSlice.chpl
+Parsed file: $CHPL_HOME/modules/internal/Atomics.chpl
+Parsed file: $CHPL_HOME/modules/internal/AtomicsCommon.chpl
+Parsed file: $CHPL_HOME/modules/internal/ByteBufferHelpers.chpl
+Parsed file: $CHPL_HOME/modules/internal/Bytes.chpl
+Parsed file: $CHPL_HOME/modules/internal/BytesCasts.chpl
+Parsed file: $CHPL_HOME/modules/internal/BytesStringCommon.chpl
+Parsed file: $CHPL_HOME/modules/internal/CString.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelArray.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelAutoAggregation.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelAutoLocalAccess.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelBase.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelContext.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelDebugPrint.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelDistribution.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelDomain.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelGpuSupport.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelHashing.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelHashtable.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelIOSerialize.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelIOStringifyHelper.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelIteratorSupport.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelLocale.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelLocks.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelNumLocales.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelPrivatization.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelRange.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelReduce.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelSerializedBroadcast.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelStandard.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelStaticVars.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelSyncvar.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelTaskData.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelTaskDataHelp.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelTaskID.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelThreads.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelTuple.chpl
+Parsed file: $CHPL_HOME/modules/internal/ChapelUtil.chpl
+Parsed file: $CHPL_HOME/modules/internal/DefaultAssociative.chpl
+Parsed file: $CHPL_HOME/modules/internal/DefaultRectangular.chpl
+Parsed file: $CHPL_HOME/modules/internal/DefaultSparse.chpl
+Parsed file: $CHPL_HOME/modules/internal/ExportWrappers.chpl
+Parsed file: $CHPL_HOME/modules/internal/ExternalArray.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocaleModelHelpFlat.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocaleModelHelpMem.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocaleModelHelpRuntime.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocaleModelHelpSetup.chpl
+Parsed file: $CHPL_HOME/modules/internal/LocalesArray.chpl
+Parsed file: $CHPL_HOME/modules/internal/MemConsistency.chpl
+Parsed file: $CHPL_HOME/modules/internal/MemTracking.chpl
+Parsed file: $CHPL_HOME/modules/internal/NetworkAtomicTypes.chpl
+Parsed file: $CHPL_HOME/modules/internal/NetworkAtomics.chpl
+Parsed file: $CHPL_HOME/modules/internal/OwnedObject.chpl
+Parsed file: $CHPL_HOME/modules/internal/PrintModuleInitOrder.chpl
+Parsed file: $CHPL_HOME/modules/internal/SharedObject.chpl
+Parsed file: $CHPL_HOME/modules/internal/String.chpl
+Parsed file: $CHPL_HOME/modules/internal/StringCasts.chpl
+Parsed file: $CHPL_HOME/modules/internal/localeModels/flat/LocaleModel.chpl
+Parsed file: $CHPL_HOME/modules/internal/startInitCommDiags.chpl
+Parsed file: $CHPL_HOME/modules/internal/stopInitCommDiags.chpl
+Parsed file: $CHPL_HOME/modules/internal/tasktable/off/ChapelTaskTable.chpl
+Parsed file: $CHPL_HOME/modules/layouts/LayoutCS.chpl
+Parsed file: $CHPL_HOME/modules/packages/CopyAggregation.chpl
+Parsed file: $CHPL_HOME/modules/packages/NPBRandom.chpl
+Parsed file: $CHPL_HOME/modules/packages/RangeChunk.chpl
+Parsed file: $CHPL_HOME/modules/packages/Search.chpl
+Parsed file: $CHPL_HOME/modules/packages/Sort.chpl
+Parsed file: $CHPL_HOME/modules/standard/AutoMath.chpl
+Parsed file: $CHPL_HOME/modules/standard/CTypes.chpl
+Parsed file: $CHPL_HOME/modules/standard/ChapelIO.chpl
+Parsed file: $CHPL_HOME/modules/standard/ChplConfig.chpl
+Parsed file: $CHPL_HOME/modules/standard/CommDiagnostics.chpl
+Parsed file: $CHPL_HOME/modules/standard/Communication.chpl
+Parsed file: $CHPL_HOME/modules/standard/Errors.chpl
+Parsed file: $CHPL_HOME/modules/standard/HaltWrappers.chpl
+Parsed file: $CHPL_HOME/modules/standard/IO.chpl
+Parsed file: $CHPL_HOME/modules/standard/JSON.chpl
+Parsed file: $CHPL_HOME/modules/standard/List.chpl
+Parsed file: $CHPL_HOME/modules/standard/Map.chpl
+Parsed file: $CHPL_HOME/modules/standard/Math.chpl
+Parsed file: $CHPL_HOME/modules/standard/MemMove.chpl
+Parsed file: $CHPL_HOME/modules/standard/OS.chpl
+Parsed file: $CHPL_HOME/modules/standard/Random.chpl
+Parsed file: $CHPL_HOME/modules/standard/Reflection.chpl
+Parsed file: $CHPL_HOME/modules/standard/Regex.chpl
+Parsed file: $CHPL_HOME/modules/standard/Time.chpl
+Parsed file: $CHPL_HOME/modules/standard/Types.chpl
+Parsed file: $CHPL_HOME/modules/standard/WeakPointer.chpl
+Parsed file: $CHPL_HOME/modules/standard/gen/.../ChapelSysCTypes.chpl
+Parsed file: testGenLib.chpl
 MYPREFIX: doMyM-doMyM-doMyM
 MYPREFIX: doMrehtO-doMrehtO-doMrehtO
diff --git a/test/separate_compilation/serialization/testGenLib.compopts b/test/separate_compilation/serialization/testGenLib.compopts
index 6c813e943714..cb8afacc300a 100644
--- a/test/separate_compilation/serialization/testGenLib.compopts
+++ b/test/separate_compilation/serialization/testGenLib.compopts
@@ -1,4 +1,4 @@
-MyMod.dyno --dyno-debug-trace # testGenLib.MyMod.good
-OtherMod.dyno --dyno-debug-trace # testGenLib.OtherMod.good
-MyMod.dyno OtherMod.dyno --dyno-debug-trace # testGenLib.both.good
-MyMod.dyno OtherMod.dyno chpl_standard.dyno --dyno-debug-trace # testGenLib.standard.good
+MyMod.dyno --dyno-debug-print-parsed-files # testGenLib.MyMod.good
+OtherMod.dyno --dyno-debug-print-parsed-files # testGenLib.OtherMod.good
+MyMod.dyno OtherMod.dyno --dyno-debug-print-parsed-files # testGenLib.both.good
+MyMod.dyno OtherMod.dyno chpl_standard.dyno --dyno-debug-print-parsed-files # testGenLib.standard.good
diff --git a/test/separate_compilation/serialization/testGenLib.prediff b/test/separate_compilation/serialization/testGenLib.prediff
index 9fcb0f743b8b..f7337926b133 100755
--- a/test/separate_compilation/serialization/testGenLib.prediff
+++ b/test/separate_compilation/serialization/testGenLib.prediff
@@ -1,10 +1,7 @@
 #!/bin/bash
 
-grep "fileTextQuery (\|^MYPREFIX" $2 > $2.tmp
+grep "Parsed file:\|^MYPREFIX" $2 > $2.tmp
 
-cat $2.tmp | sed 's/hash: .*$//g' > $2
-
-mv $2 $2.tmp
 cat $2.tmp | sed "s|${CHPL_HOME}|\$CHPL_HOME|g" > $2
 
 mv $2 $2.tmp
diff --git a/test/separate_compilation/serialization/testGenLib.standard.good b/test/separate_compilation/serialization/testGenLib.standard.good
index 65b3d29bac20..d32f23368df0 100644
--- a/test/separate_compilation/serialization/testGenLib.standard.good
+++ b/test/separate_compilation/serialization/testGenLib.standard.good
@@ -1,3 +1,3 @@
-2 { fileTextQuery ("testGenLib.chpl") 
+Parsed file: testGenLib.chpl
 MYPREFIX: doMyM-doMyM-doMyM
 MYPREFIX: doMrehtO-doMrehtO-doMrehtO
diff --git a/util/chpl-completion.bash b/util/chpl-completion.bash
index ffc4e2ad8122..3a8b52a47570 100644
--- a/util/chpl-completion.bash
+++ b/util/chpl-completion.bash
@@ -67,6 +67,7 @@ _chpl ()
 --dyno \
 --dyno-break-error \
 --dyno-break-on-hash \
+--dyno-debug-print-parsed-files \
 --dyno-debug-trace \
 --dyno-gen-lib \
 --dyno-gen-std \
@@ -75,6 +76,7 @@ _chpl ()
 --dyno-scope-resolve \
 --dyno-verify-serialization \
 --early-deinit \
+--exit-leaks \
 --explain-call \
 --explain-call-id \
 --explain-instantiation \
@@ -197,12 +199,14 @@ _chpl ()
 --no-dynamic-auto-local-access \
 --no-dyno \
 --no-dyno-break-error \
+--no-dyno-debug-print-parsed-files \
 --no-dyno-debug-trace \
 --no-dyno-scope-bundled \
 --no-dyno-scope-production \
 --no-dyno-scope-resolve \
 --no-dyno-verify-serialization \
 --no-early-deinit \
+--no-exit-leaks \
 --no-explain-verbose \
 --no-fast-followers \
 --no-force-vectorize \