diff --git a/CHANGES b/CHANGES
index 63fa67aac0..846a4ac333 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+4.2.0-dev.448 | 2021-12-10 15:35:34 -0700
+
+  * update btest to no longer use (unsupported) %S formatting, no longer needed (Vern Paxson, Corelight)
+
+  * replace --optimize-only with --optimize-funcs and --optimize-files (Vern Paxson, Corelight)
+
 4.2.0-dev.444 | 2021-12-10 13:13:13 -0700
 
   * reintroduction of "-O add-C++" option (Vern Paxson, Corelight)
diff --git a/VERSION b/VERSION
index 574b90b1b8..e571887fde 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.2.0-dev.444
+4.2.0-dev.448
diff --git a/src/Options.cc b/src/Options.cc
index 2ad4bbe264..8f97e5031d 100644
--- a/src/Options.cc
+++ b/src/Options.cc
@@ -122,10 +122,12 @@ void usage(const char* prog, int code)
 	fprintf(stderr, "    -I|--print-id <ID name>         | print out given ID\n");
 	fprintf(stderr, "    -N|--print-plugins              | print available plugins and exit (-NN "
 	                "for verbose)\n");
-	fprintf(stderr, "    -O|--optimize[=<option>]        | enable script optimization (use -O help "
+	fprintf(stderr, "    -O|--optimize <option>          | enable script optimization (use -O help "
 	                "for options)\n");
-	fprintf(stderr, "    -o|--optimize-only=<func>       | enable script optimization only for the "
-	                "given function\n");
+	fprintf(stderr, "    -0|--optimize-files=<pat>       | enable script optimization for all "
+	                "functions in files with names containing the given pattern\n");
+	fprintf(stderr, "    -o|--optimize-funcs=<pat>       | enable script optimization for "
+	                "functions with names fully matching the given pattern\n");
 	fprintf(stderr, "    -P|--prime-dns                  | prime DNS\n");
 	fprintf(stderr,
 	        "    -Q|--time                       | print execution time summary to stderr\n");
@@ -383,7 +385,8 @@ Options parse_cmdline(int argc, char** argv)
 		{"save-seeds", required_argument, nullptr, 'H'},
 		{"print-plugins", no_argument, nullptr, 'N'},
 		{"optimize", required_argument, nullptr, 'O'},
-		{"optimize-only", required_argument, nullptr, 'o'},
+		{"optimize-funcs", required_argument, nullptr, 'o'},
+		{"optimize-files", required_argument, nullptr, '0'},
 		{"prime-dns", no_argument, nullptr, 'P'},
 		{"time", no_argument, nullptr, 'Q'},
 		{"debug-rules", no_argument, nullptr, 'S'},
@@ -406,7 +409,7 @@ Options parse_cmdline(int argc, char** argv)
 	};
 
 	char opts[256];
-	util::safe_strncpy(opts, "B:c:e:f:G:H:I:i:j::n:O:o:p:r:s:T:t:U:w:X:CDFMNPQSWabdhmuv",
+	util::safe_strncpy(opts, "B:c:e:f:G:H:I:i:j::n:O:0:o:p:r:s:T:t:U:w:X:CDFMNPQSWabdhmuv",
 	                   sizeof(opts));
 
 	int op;
@@ -546,7 +549,10 @@ Options parse_cmdline(int argc, char** argv)
 				set_analysis_option(optarg, rval);
 				break;
 			case 'o':
-				rval.analysis_options.only_func = optarg;
+				add_func_analysis_pattern(rval.analysis_options, optarg);
+				break;
+			case '0':
+				add_file_analysis_pattern(rval.analysis_options, optarg);
 				break;
 			case 'P':
 				if ( rval.dns_mode != detail::DNS_DEFAULT )
diff --git a/src/scan.l b/src/scan.l
index 6b1c7bf138..4012d60645 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -61,8 +61,9 @@ int conditional_epoch = 0;
 // Whether the current file has included conditionals (so far).
 bool current_file_has_conditionals = false;
 
-// The files that include conditionals.  Not currently used, but will be
-// in the future once we add --optimize-files=/pat/.
+// The files that include conditionals.  Used when compiling scripts to C++
+// to flag issues for --optimize-files=/pat/ where one of the files includes
+// conditional code.
 std::unordered_set<std::string> files_with_conditionals;
 
 zeek::detail::int_list if_stack;
@@ -692,6 +693,8 @@ static int load_files(const char* orig_file)
 	// every Obj created when parsing it.
 	yylloc.filename = filename = zeek::util::copy_string(file_path.c_str());
 
+	current_file_has_conditionals = files_with_conditionals.count(filename) > 0;
+
 	entry_cond_depth.push_back(conditional_depth);
 
 	return 1;
@@ -873,7 +876,6 @@ int yywrap()
 		}
 
 	last_filename = ::filename;
-	current_file_has_conditionals = false;
 
 	if ( zeek::reporter->Errors() > 0 )
 		return 1;
@@ -884,8 +886,11 @@ int yywrap()
 		delete file_stack.remove_nth(file_stack.length() - 1);
 
 	if ( YY_CURRENT_BUFFER )
+		{
 		// There's more on the stack to scan.
+		current_file_has_conditionals = files_with_conditionals.count(::filename) > 0;
 		return 0;
+		}
 
 	// Stack is now empty.
 	while ( essential_input_files.length() > 0 || input_files.length() > 0 )
diff --git a/src/script_opt/CPP/Driver.cc b/src/script_opt/CPP/Driver.cc
index 1f6e245d47..fc3490c5c2 100644
--- a/src/script_opt/CPP/Driver.cc
+++ b/src/script_opt/CPP/Driver.cc
@@ -6,6 +6,8 @@
 
 #include "zeek/script_opt/CPP/Compile.h"
 
+extern std::unordered_set<std::string> files_with_conditionals;
+
 namespace zeek::detail
 	{
 
@@ -72,29 +74,48 @@ void CPPCompile::Compile(bool report_uncompilable)
 
 	GenProlog();
 
+	unordered_set<string> filenames_reported_as_skipped;
+
 	// Determine which functions we can call directly, and reuse
 	// previously compiled instances of those if present.
-	for ( const auto& func : funcs )
+	for ( auto& func : funcs )
 		{
+		const auto& f = func.Func();
+
+		auto& ofiles = analysis_options.only_files;
+		string fn = func.Body()->GetLocationInfo()->filename;
+
+		if ( ! func.ShouldSkip() && ! ofiles.empty() && files_with_conditionals.count(fn) > 0 )
+			{
+			if ( filenames_reported_as_skipped.count(fn) == 0 )
+				{
+				reporter->Warning(
+					"skipping compilation of files in %s due to presence of conditional code",
+					fn.c_str());
+				filenames_reported_as_skipped.insert(fn);
+				}
+
+			func.SetSkip(true);
+			}
+
 		if ( func.ShouldSkip() )
 			{
-			not_fully_compilable.insert(func.Func()->Name());
+			not_fully_compilable.insert(f->Name());
 			continue;
 			}
 
-		if ( func.Func()->Flavor() != FUNC_FLAVOR_FUNCTION )
-			// Can't be called directly.
-			continue;
-
 		const char* reason;
 		if ( IsCompilable(func, &reason) )
-			compilable_funcs.insert(BodyName(func));
+			{
+			if ( f->Flavor() == FUNC_FLAVOR_FUNCTION )
+				// Note this as a callable compiled function.
+				compilable_funcs.insert(BodyName(func));
+			}
 		else
 			{
 			if ( reason && report_uncompilable )
-				fprintf(stderr, "%s cannot be compiled to C++ due to %s\n", func.Func()->Name(),
-				        reason);
-			not_fully_compilable.insert(func.Func()->Name());
+				fprintf(stderr, "%s cannot be compiled to C++ due to %s\n", f->Name(), reason);
+			not_fully_compilable.insert(f->Name());
 			}
 		}
 
@@ -105,7 +126,6 @@ void CPPCompile::Compile(bool report_uncompilable)
 		types.AddKey(tp, pfs.HashType(t));
 		}
 
-	// ### This doesn't work for -O add-C++
 	Emit("TypePtr types__CPP[%s];", Fmt(static_cast<int>(types.DistinctKeys().size())));
 
 	NL();
diff --git a/src/script_opt/CPP/README.md b/src/script_opt/CPP/README.md
index ef3fdf570e..1ed3cc6c13 100644
--- a/src/script_opt/CPP/README.md
+++ b/src/script_opt/CPP/README.md
@@ -162,17 +162,7 @@ about associated expressions/statements, making them hard to puzzle out.
 This could be fixed, but would add execution overhead in passing around
 the necessary strings / `Location` objects.
 
-* Subtle bugs can arise when compiling code that uses `@if` conditional
-compilation.  The compiled code will not directly use the wrong instance
-of a script body (one that differs due to the `@if` conditional having a
-different resolution at compile time versus later run-time).  However, if
-compiled code itself calls a function that has conditional code, the
-compiled code will always call the version of the function present during
-compilation, rather than the run-time version.  This problem can be fixed
-at the cost of making all function calls more expensive (perhaps a measure
-that requires an explicit flag to activate); or, when possible, by modifying
-the conditional code to check the condition at run-time rather than at
-compile-time.
+* To avoid subtle bugs, the compiler will refrain from compiling script elements (functions, hooks, event handlers) that include conditional code.  In addition, when using `--optimize-files` it will not compile any functions appearing in a source file that includes conditional code (even if it's not in a function body).
 
 * Code compiled with `-O gen-standalone-C++` will not execute any global
 statements when invoked using the "stand-in" script.  The right fix for
diff --git a/src/script_opt/Inline.cc b/src/script_opt/Inline.cc
index 8d0d60f1ad..15e1c81391 100644
--- a/src/script_opt/Inline.cc
+++ b/src/script_opt/Inline.cc
@@ -107,19 +107,29 @@ void Inliner::Analyze()
 		}
 
 	for ( auto& f : funcs )
+		{
+		const auto& func_ptr = f.FuncPtr();
+		const auto& func = func_ptr.get();
+		const auto& body = f.Body();
+
 		// Candidates are non-event, non-hook, non-recursive,
 		// non-compiled functions ... that don't use lambdas or when's,
 		// since we don't currently compute the closures/frame
 		// sizes for them correctly, and more fundamentally since
 		// we don't compile them and hence inlining them will
 		// make the parent non-compilable.
-		if ( f.Func()->Flavor() == FUNC_FLAVOR_FUNCTION &&
-		     non_recursive_funcs.count(f.Func()) > 0 && f.Profile()->NumLambdas() == 0 &&
-		     f.Profile()->NumWhenStmts() == 0 && f.Body()->Tag() != STMT_CPP )
-			inline_ables.insert(f.Func());
+		if ( should_analyze(func_ptr, body) && func->Flavor() == FUNC_FLAVOR_FUNCTION &&
+		     non_recursive_funcs.count(func) > 0 && f.Profile()->NumLambdas() == 0 &&
+		     f.Profile()->NumWhenStmts() == 0 && body->Tag() != STMT_CPP )
+			inline_ables.insert(func);
+		}
 
 	for ( auto& f : funcs )
 		{
+		const auto& func_ptr = f.FuncPtr();
+		const auto& func = func_ptr.get();
+		const auto& body = f.Body();
+
 		// Processing optimization: only spend time trying to inline f
 		// if we haven't marked it as inlineable.  This trades off a
 		// bunch of compilation load (inlining every single function,
@@ -128,7 +138,8 @@ void Inliner::Analyze()
 		// circumstances in which a Zeek function can be called
 		// not ultimately stemming from an event (such as global
 		// scripting, or expiration functions).
-		if ( inline_ables.count(f.Func()) == 0 )
+
+		if ( should_analyze(func_ptr, body) && inline_ables.count(func) == 0 )
 			InlineFunction(&f);
 		}
 	}
diff --git a/src/script_opt/ProfileFunc.cc b/src/script_opt/ProfileFunc.cc
index b7ccae6f68..0716a885e3 100644
--- a/src/script_opt/ProfileFunc.cc
+++ b/src/script_opt/ProfileFunc.cc
@@ -461,8 +461,6 @@ ProfileFuncs::ProfileFuncs(std::vector<FuncInfo>& funcs, is_compilable_pred pred
 
 		if ( ! pred || (*pred)(pf.get(), nullptr) )
 			MergeInProfile(pf.get());
-		else
-			f.SetSkip(true);
 
 		f.SetProfile(std::move(pf));
 		func_profs[f.Func()] = f.ProfilePtr();
diff --git a/src/script_opt/ScriptOpt.cc b/src/script_opt/ScriptOpt.cc
index f875e4588a..cf688f32d4 100644
--- a/src/script_opt/ScriptOpt.cc
+++ b/src/script_opt/ScriptOpt.cc
@@ -39,14 +39,14 @@ static ScriptFuncPtr global_stmts;
 
 void analyze_func(ScriptFuncPtr f)
 	{
-	// Even if we're doing --optimize-only, we still track all functions
-	// here because the inliner will need the full list.
+	// Even if we're analyzing only a subset of the scripts, we still
+	// track all functions here because the inliner will need the full list.
 	funcs.emplace_back(f, f->GetScope(), f->CurrentBody(), f->CurrentPriority());
 	}
 
 const FuncInfo* analyze_global_stmts(Stmt* stmts)
 	{
-	// We ignore analysis_options.only_func - if it's in use, later
+	// We ignore analysis_options.only_{files,funcs} - if they're in use, later
 	// logic will keep this function from being compiled, but it's handy
 	// now to enter it into "funcs" so we have a FuncInfo to return.
 
@@ -65,6 +65,55 @@ const FuncInfo* analyze_global_stmts(Stmt* stmts)
 	return &funcs.back();
 	}
 
+void add_func_analysis_pattern(AnalyOpt& opts, const char* pat)
+	{
+	try
+		{
+		std::string full_pat = std::string("^(") + pat + ")$";
+		opts.only_funcs.emplace_back(std::regex(full_pat));
+		}
+	catch ( const std::regex_error& e )
+		{
+		reporter->FatalError("bad file analysis pattern: %s", pat);
+		}
+	}
+
+void add_file_analysis_pattern(AnalyOpt& opts, const char* pat)
+	{
+	try
+		{
+		std::string full_pat = std::string("^.*(") + pat + ").*$";
+		opts.only_files.emplace_back(std::regex(full_pat));
+		}
+	catch ( const std::regex_error& e )
+		{
+		reporter->FatalError("bad file analysis pattern: %s", pat);
+		}
+	}
+
+bool should_analyze(const ScriptFuncPtr& f, const StmtPtr& body)
+	{
+	auto& ofuncs = analysis_options.only_funcs;
+	auto& ofiles = analysis_options.only_files;
+
+	if ( ofiles.empty() && ofuncs.empty() )
+		return true;
+
+	auto fn = f->Name();
+
+	for ( auto& o : ofuncs )
+		if ( std::regex_match(fn, o) )
+			return true;
+
+	fn = body->GetLocationInfo()->filename;
+
+	for ( auto& o : ofiles )
+		if ( std::regex_match(fn, o) )
+			return true;
+
+	return false;
+	}
+
 static bool optimize_AST(ScriptFunc* f, std::shared_ptr<ProfileFunc>& pf,
                          std::shared_ptr<Reducer>& rc, ScopePtr scope, StmtPtr& body)
 	{
@@ -97,7 +146,7 @@ static void optimize_func(ScriptFunc* f, std::shared_ptr<ProfileFunc> pf, ScopeP
 	if ( reporter->Errors() > 0 )
 		return;
 
-	if ( analysis_options.only_func )
+	if ( analysis_options.dump_xform )
 		printf("Original: %s\n", obj_desc(body.get()).c_str());
 
 	if ( body->Tag() == STMT_CPP )
@@ -245,11 +294,11 @@ static void init_options()
 	if ( usage )
 		analysis_options.usage_issues = 1;
 
-	if ( ! analysis_options.only_func )
+	if ( analysis_options.only_funcs.empty() )
 		{
 		auto zo = getenv("ZEEK_ONLY");
 		if ( zo )
-			analysis_options.only_func = zo;
+			add_file_analysis_pattern(analysis_options, zo);
 		}
 
 	if ( analysis_options.gen_ZAM )
@@ -262,14 +311,8 @@ static void init_options()
 	if ( analysis_options.dump_ZAM )
 		analysis_options.gen_ZAM_code = true;
 
-	if ( analysis_options.only_func )
+	if ( ! analysis_options.only_funcs.empty() || ! analysis_options.only_files.empty() )
 		{
-		// Note, this comes after the statement above because for
-		// --optimize-only we don't necessarily want to go all
-		// the way to *generating* ZAM code, though we'll want to
-		// dump it *if* we generate it.
-		analysis_options.dump_xform = analysis_options.dump_ZAM = true;
-
 		if ( analysis_options.gen_ZAM_code || generating_CPP )
 			analysis_options.report_uncompilable = true;
 		}
@@ -278,8 +321,8 @@ static void init_options()
 	     ! generating_CPP )
 		reporter->FatalError("report-uncompilable requires generation of ZAM or C++");
 
-	if ( analysis_options.only_func || analysis_options.optimize_AST ||
-	     analysis_options.gen_ZAM_code || analysis_options.usage_issues > 0 )
+	if ( analysis_options.optimize_AST || analysis_options.gen_ZAM_code ||
+	     analysis_options.usage_issues > 0 )
 		analysis_options.activate = true;
 	}
 
@@ -388,54 +431,6 @@ static void generate_CPP(std::unique_ptr<ProfileFuncs>& pfs)
 	CPPCompile cpp(funcs, *pfs, gen_name, add, standalone, report);
 	}
 
-static void find_when_funcs(std::unique_ptr<ProfileFuncs>& pfs,
-                            std::unordered_set<const ScriptFunc*>& when_funcs)
-	{
-	// Figure out which functions either directly or indirectly
-	// appear in "when" clauses.
-
-	// Which functions we still need to analyze.
-	std::unordered_set<const ScriptFunc*> when_funcs_to_do;
-
-	for ( auto& f : funcs )
-		if ( f.Profile()->WhenCalls().size() > 0 )
-			{
-			when_funcs.insert(f.Func());
-
-			for ( auto& bf : f.Profile()->WhenCalls() )
-				{
-				ASSERT(pfs->FuncProf(bf));
-				when_funcs_to_do.insert(bf);
-				}
-			}
-
-	// Set of new functions to put on to-do list.  Separate from
-	// the to-do list itself so we don't modify it while iterating
-	// over it.
-	std::unordered_set<const ScriptFunc*> new_to_do;
-
-	while ( when_funcs_to_do.size() > 0 )
-		{
-		for ( auto& wf : when_funcs_to_do )
-			{
-			when_funcs.insert(wf);
-
-			for ( auto& wff : pfs->FuncProf(wf)->ScriptCalls() )
-				{
-				if ( when_funcs.count(wff) > 0 )
-					// We've already processed this
-					// function.
-					continue;
-
-				new_to_do.insert(wff);
-				}
-			}
-
-		when_funcs_to_do = new_to_do;
-		new_to_do.clear();
-		}
-	}
-
 static void analyze_scripts_for_ZAM(std::unique_ptr<ProfileFuncs>& pfs)
 	{
 	if ( analysis_options.usage_issues > 0 && analysis_options.optimize_AST )
@@ -455,12 +450,6 @@ static void analyze_scripts_for_ZAM(std::unique_ptr<ProfileFuncs>& pfs)
 
 	pfs = std::make_unique<ProfileFuncs>(funcs, nullptr, true);
 
-	// set of functions involved (directly or indirectly) in "when"
-	// clauses.
-	std::unordered_set<const ScriptFunc*> when_funcs;
-
-	find_when_funcs(pfs, when_funcs);
-
 	bool report_recursive = analysis_options.report_recursive;
 	std::unique_ptr<Inliner> inl;
 	if ( analysis_options.inliner )
@@ -501,13 +490,15 @@ static void analyze_scripts_for_ZAM(std::unique_ptr<ProfileFuncs>& pfs)
 			}
 		}
 
+	bool did_one = false;
+
 	for ( auto& f : funcs )
 		{
 		auto func = f.Func();
 
-		if ( analysis_options.only_func )
+		if ( ! analysis_options.only_funcs.empty() || ! analysis_options.only_files.empty() )
 			{
-			if ( *analysis_options.only_func != func->Name() )
+			if ( ! should_analyze(f.FuncPtr(), f.Body()) )
 				continue;
 			}
 
@@ -519,7 +510,11 @@ static void analyze_scripts_for_ZAM(std::unique_ptr<ProfileFuncs>& pfs)
 		auto new_body = f.Body();
 		optimize_func(func, f.ProfilePtr(), f.Scope(), new_body);
 		f.SetBody(new_body);
+		did_one = true;
 		}
+
+	if ( ! did_one )
+		reporter->FatalError("no matching functions/files for -O ZAM");
 	}
 
 void analyze_scripts()
@@ -532,24 +527,31 @@ void analyze_scripts()
 		did_init = true;
 		}
 
+	auto& ofuncs = analysis_options.only_funcs;
+	auto& ofiles = analysis_options.only_files;
+
 	if ( ! analysis_options.activate && ! analysis_options.inliner && ! generating_CPP &&
 	     ! analysis_options.report_CPP && ! analysis_options.use_CPP )
-		// No work to do, avoid profiling overhead.
-		return;
+		{ // No work to do, avoid profiling overhead.
+		if ( ! ofuncs.empty() )
+			reporter->FatalError("--optimize-funcs used but no optimization specified");
+		if ( ! ofiles.empty() )
+			reporter->FatalError("--optimize-files used but no optimization specified");
 
-	if ( analysis_options.gen_CPP )
-		{
-		if ( analysis_options.only_func )
-			{ // deactivate all functions except the target one
-			for ( auto& func : funcs )
-				{
-				auto fn = func.Func()->Name();
-				if ( *analysis_options.only_func != fn )
-					func.SetSkip(true);
-				}
-			}
+		return;
 		}
 
+	bool have_one_to_do = false;
+
+	for ( auto& func : funcs )
+		if ( should_analyze(func.FuncPtr(), func.Body()) )
+			have_one_to_do = true;
+		else
+			func.SetSkip(true);
+
+	if ( ! have_one_to_do )
+		reporter->FatalError("no matching functions/files for C++ compilation");
+
 	// Now that everything's parsed and BiF's have been initialized,
 	// profile the functions.
 	auto pfs = std::make_unique<ProfileFuncs>(funcs, is_CPP_compilable, false);
@@ -568,6 +570,9 @@ void analyze_scripts()
 
 	if ( generating_CPP )
 		{
+		if ( analysis_options.gen_ZAM )
+			reporter->FatalError("-O ZAM and -O gen-C++ conflict");
+
 		generate_CPP(pfs);
 		exit(0);
 		}
diff --git a/src/script_opt/ScriptOpt.h b/src/script_opt/ScriptOpt.h
index 9c9fe184e8..dba9a41187 100644
--- a/src/script_opt/ScriptOpt.h
+++ b/src/script_opt/ScriptOpt.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <optional>
+#include <regex>
 #include <string>
 
 #include "zeek/Expr.h"
@@ -24,9 +25,14 @@ namespace zeek::detail
 struct AnalyOpt
 	{
 
-	// If non-nil, then only analyze the given function/event/hook.
+	// If non-nil, then only analyze function/event/hook(s) whose names
+	// match one of the given regular expressions.
+	//
 	// Applies to both ZAM and C++.
-	std::optional<std::string> only_func;
+	std::vector<std::regex> only_funcs;
+
+	// Same, but for the filenames where the function is found.
+	std::vector<std::regex> only_files;
 
 	// For a given compilation target, report functions that can't
 	// be compiled.
@@ -68,7 +74,7 @@ struct AnalyOpt
 
 	// If true, dump out transformed code: the results of reducing
 	// interpreted scripts, and, if optimize is set, of then optimizing
-	// them.  Always done if only_func is set.
+	// them.
 	bool dump_xform = false;
 
 	// If true, dump out the use-defs for each analyzed function.
@@ -166,6 +172,16 @@ extern void analyze_func(ScriptFuncPtr f);
 // be Invoked, or its body executed directly, to execute the statements.
 extern const FuncInfo* analyze_global_stmts(Stmt* stmts);
 
+// Add a pattern to the "only_funcs" list.
+extern void add_func_analysis_pattern(AnalyOpt& opts, const char* pat);
+
+// Add a pattern to the "only_files" list.
+extern void add_file_analysis_pattern(AnalyOpt& opts, const char* pat);
+
+// True if the given script function & body should be analyzed; otherwise
+// it should be skipped.
+extern bool should_analyze(const ScriptFuncPtr& f, const StmtPtr& body);
+
 // Analyze all of the parsed scripts collectively for optimization.
 extern void analyze_scripts();
 
diff --git a/testing/btest/Baseline/opt.opt-files/output b/testing/btest/Baseline/opt.opt-files/output
new file mode 100644
index 0000000000..db1bbc981f
--- /dev/null
+++ b/testing/btest/Baseline/opt.opt-files/output
@@ -0,0 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+I should be ZAM code!
+my_test
+ZAM-code my_test 
diff --git a/testing/btest/Baseline/opt.opt-files2/output b/testing/btest/Baseline/opt.opt-files2/output
new file mode 100644
index 0000000000..896f5f18fe
--- /dev/null
+++ b/testing/btest/Baseline/opt.opt-files2/output
@@ -0,0 +1,8 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+I shouldn't be ZAM code!
+my_test
+{ 
+print I shouldn't be ZAM code!;
+}
+set_to_regex
+ZAM-code set_to_regex 
diff --git a/testing/btest/Baseline/opt.opt-files3/output b/testing/btest/Baseline/opt.opt-files3/output
new file mode 100644
index 0000000000..4a5533b63e
--- /dev/null
+++ b/testing/btest/Baseline/opt.opt-files3/output
@@ -0,0 +1,6 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+I should be ZAM code!
+my_test
+ZAM-code my_test 
+set_to_regex
+ZAM-code set_to_regex 
diff --git a/testing/btest/Baseline/opt.opt-func/output b/testing/btest/Baseline/opt.opt-func/output
new file mode 100644
index 0000000000..50aa0f4560
--- /dev/null
+++ b/testing/btest/Baseline/opt.opt-func/output
@@ -0,0 +1,9 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+I should be ZAM code!
+I shouldn't be ZAM code!
+my_test
+ZAM-code my_test 
+another_test
+{ 
+print I shouldn't be ZAM code!;
+}
diff --git a/testing/btest/Baseline/opt.opt-func2/output b/testing/btest/Baseline/opt.opt-func2/output
new file mode 100644
index 0000000000..e60a7f1160
--- /dev/null
+++ b/testing/btest/Baseline/opt.opt-func2/output
@@ -0,0 +1,9 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+I shouldn't be ZAM code!
+I should be ZAM code!
+my_test
+{ 
+print I shouldn't be ZAM code!;
+}
+another_test
+ZAM-code another_test 
diff --git a/testing/btest/Baseline/opt.opt-func3/output b/testing/btest/Baseline/opt.opt-func3/output
new file mode 100644
index 0000000000..011a85e8c4
--- /dev/null
+++ b/testing/btest/Baseline/opt.opt-func3/output
@@ -0,0 +1,7 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Me and my buds should be ZAM code!
+that includes me!
+my_test
+ZAM-code my_test 
+another_test
+ZAM-code another_test 
diff --git a/testing/btest/Baseline/opt.opt-no-files/.stderr b/testing/btest/Baseline/opt.opt-no-files/.stderr
new file mode 100644
index 0000000000..ba158c1e5e
--- /dev/null
+++ b/testing/btest/Baseline/opt.opt-no-files/.stderr
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+fatal error: no matching functions/files for C++ compilation
diff --git a/testing/btest/Baseline/opt.opt-no-func/.stderr b/testing/btest/Baseline/opt.opt-no-func/.stderr
new file mode 100644
index 0000000000..ba158c1e5e
--- /dev/null
+++ b/testing/btest/Baseline/opt.opt-no-func/.stderr
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+fatal error: no matching functions/files for C++ compilation
diff --git a/testing/btest/Baseline/opt.opt-no-func2/.stderr b/testing/btest/Baseline/opt.opt-no-func2/.stderr
new file mode 100644
index 0000000000..ba158c1e5e
--- /dev/null
+++ b/testing/btest/Baseline/opt.opt-no-func2/.stderr
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+fatal error: no matching functions/files for C++ compilation
diff --git a/testing/btest/opt/opt-files.zeek b/testing/btest/opt/opt-files.zeek
new file mode 100644
index 0000000000..c311f6359f
--- /dev/null
+++ b/testing/btest/opt/opt-files.zeek
@@ -0,0 +1,15 @@
+# @TEST-EXEC: zeek -b -O ZAM --optimize-files='opt-files' %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+# Tests that we can selectively pick this file.
+
+function my_test()
+	{
+	print "I should be ZAM code!";
+	}
+
+event zeek_init()
+	{
+	my_test();
+	print my_test;
+	}
diff --git a/testing/btest/opt/opt-files2.zeek b/testing/btest/opt/opt-files2.zeek
new file mode 100644
index 0000000000..576680cae9
--- /dev/null
+++ b/testing/btest/opt/opt-files2.zeek
@@ -0,0 +1,16 @@
+# @TEST-EXEC: zeek -b -O ZAM --optimize-files='base/utils' %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+# Tests that we can selectively pick a group of files but not this one.
+
+function my_test()
+	{
+	print "I shouldn't be ZAM code!";
+	}
+
+event zeek_init()
+	{
+	my_test();
+	print my_test;
+	print set_to_regex;
+	}
diff --git a/testing/btest/opt/opt-files3.zeek b/testing/btest/opt/opt-files3.zeek
new file mode 100644
index 0000000000..588c633c8d
--- /dev/null
+++ b/testing/btest/opt/opt-files3.zeek
@@ -0,0 +1,16 @@
+# @TEST-EXEC: zeek -b -O ZAM --optimize-files='base/utils' --optimize-files='opt-files3' %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+# Tests that we can selectively pick a group of files *and* this one.
+
+function my_test()
+	{
+	print "I should be ZAM code!";
+	}
+
+event zeek_init()
+	{
+	my_test();
+	print my_test;
+	print set_to_regex;
+	}
diff --git a/testing/btest/opt/opt-func.zeek b/testing/btest/opt/opt-func.zeek
new file mode 100644
index 0000000000..6594cffe34
--- /dev/null
+++ b/testing/btest/opt/opt-func.zeek
@@ -0,0 +1,22 @@
+# @TEST-EXEC: zeek -b -O ZAM --optimize-func='my_test' %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+# Tests that we can selectively a given function.
+
+function my_test()
+	{
+	print "I should be ZAM code!";
+	}
+
+function another_test()
+	{
+	print "I shouldn't be ZAM code!";
+	}
+
+event zeek_init()
+	{
+	my_test();
+	another_test();
+	print my_test;
+	print another_test;
+	}
diff --git a/testing/btest/opt/opt-func2.zeek b/testing/btest/opt/opt-func2.zeek
new file mode 100644
index 0000000000..c503479905
--- /dev/null
+++ b/testing/btest/opt/opt-func2.zeek
@@ -0,0 +1,23 @@
+# @TEST-EXEC: zeek -b -O ZAM --optimize-func='another_test' %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+# Tests that we can selectively a bunch of functions (event handlers),
+# but not every function.
+
+function my_test()
+	{
+	print "I shouldn't be ZAM code!";
+	}
+
+function another_test()
+	{
+	print "I should be ZAM code!";
+	}
+
+event zeek_init()
+	{
+	my_test();
+	another_test();
+	print my_test;
+	print another_test;
+	}
diff --git a/testing/btest/opt/opt-func3.zeek b/testing/btest/opt/opt-func3.zeek
new file mode 100644
index 0000000000..15f49987b1
--- /dev/null
+++ b/testing/btest/opt/opt-func3.zeek
@@ -0,0 +1,23 @@
+# @TEST-EXEC: zeek -b -O ZAM --optimize-func='my_test' --optimize-func='another_test' %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+# Tests that we can selectively a bunch of functions (event handlers),
+# and also call out an additional function.
+
+function my_test()
+	{
+	print "Me and my buds should be ZAM code!";
+	}
+
+function another_test()
+	{
+	print "that includes me!";
+	}
+
+event zeek_init()
+	{
+	my_test();
+	another_test();
+	print my_test;
+	print another_test;
+	}
diff --git a/testing/btest/opt/opt-no-files.zeek b/testing/btest/opt/opt-no-files.zeek
new file mode 100644
index 0000000000..36a22c4c5e
--- /dev/null
+++ b/testing/btest/opt/opt-no-files.zeek
@@ -0,0 +1,10 @@
+# @TEST-EXEC-FAIL: zeek -b -O ZAM --optimize-files='Xopt-files' %INPUT
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
+
+# Make sure that if --optimize-files is specified but there are no matching
+# files, that's caught as an error.
+
+event zeek_init()
+	{
+	print zeek_init;
+	}
diff --git a/testing/btest/opt/opt-no-func.zeek b/testing/btest/opt/opt-no-func.zeek
new file mode 100644
index 0000000000..88b8d6de47
--- /dev/null
+++ b/testing/btest/opt/opt-no-func.zeek
@@ -0,0 +1,10 @@
+# @TEST-EXEC-FAIL: zeek -b -O ZAM --optimize-files='my_func' %INPUT
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
+
+# Make sure that if --optimize-func is specified but there are no matching
+# functions, that's caught as an error.
+
+event zeek_init()
+	{
+	print zeek_init;
+	}
diff --git a/testing/btest/opt/opt-no-func2.zeek b/testing/btest/opt/opt-no-func2.zeek
new file mode 100644
index 0000000000..84d09b90fe
--- /dev/null
+++ b/testing/btest/opt/opt-no-func2.zeek
@@ -0,0 +1,14 @@
+# @TEST-EXEC-FAIL: zeek -b -O ZAM --optimize-files='my_func' %INPUT
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
+
+# Make sure that --optimize-func anchors the regex.
+
+function my_func2()
+	{
+	print "I shouldn't match!";
+	}
+
+event zeek_init()
+	{
+	print zeek_init;
+	}
diff --git a/testing/btest/opt/pure-inlining.zeek b/testing/btest/opt/pure-inlining.zeek
index 745864227c..993457bd7c 100644
--- a/testing/btest/opt/pure-inlining.zeek
+++ b/testing/btest/opt/pure-inlining.zeek
@@ -4,8 +4,7 @@
 # Tests pure inlining of scripts (no other optimization/compilation used).
 # The non-recursive functions should be (recursively!) inlined into the
 # body of my_handler, while neither the directly-recursive nor the
-# mutually recursive ones should be.  We print out each function body
-# in its transformed form (format %S) to test this.
+# mutually recursive ones should be.
 
 function non_recursiveA(x: double, y: double): double
 	{
@@ -56,12 +55,12 @@ event my_handler()
 
 event zeek_init()
 	{
-	print fmt("%S", non_recursiveA);
-	print fmt("%S", non_recursiveB);
-	print fmt("%S", recursive);
-	print fmt("%S", mutually_recursiveA);
-	print fmt("%S", mutually_recursiveB);
-	print fmt("%S", my_handler);
+	print fmt("%s", non_recursiveA);
+	print fmt("%s", non_recursiveB);
+	print fmt("%s", recursive);
+	print fmt("%s", mutually_recursiveA);
+	print fmt("%s", mutually_recursiveB);
+	print fmt("%s", my_handler);
 
 	event my_handler();
 	}