diff --git a/src/script_opt/CPP/InitsInfo.cc b/src/script_opt/CPP/InitsInfo.cc
index 91e087f17b..3dc3536edc 100644
--- a/src/script_opt/CPP/InitsInfo.cc
+++ b/src/script_opt/CPP/InitsInfo.cc
@@ -460,12 +460,12 @@ FuncTypeInfo::FuncTypeInfo(CPPCompile* _c, TypePtr _t) : AbstractTypeInfo(_c, st
     params = f->Params();
     yield = f->Yield();
 
-    auto gi = c->RegisterType(f->Params());
+    auto gi = c->RegisterType(params);
     if ( gi )
         init_cohort = gi->InitCohort();
 
     if ( yield ) {
-        gi = c->RegisterType(f->Yield());
+        auto gi = c->RegisterType(f->Yield());
         if ( gi )
             init_cohort = max(init_cohort, gi->InitCohort());
     }
diff --git a/src/script_opt/CPP/InitsInfo.h b/src/script_opt/CPP/InitsInfo.h
index d7f8c28e17..57121817bc 100644
--- a/src/script_opt/CPP/InitsInfo.h
+++ b/src/script_opt/CPP/InitsInfo.h
@@ -594,7 +594,7 @@ public:
 
 private:
     FunctionFlavor flavor;
-    TypePtr params;
+    RecordTypePtr params;
     TypePtr yield;
 };
 
diff --git a/src/script_opt/CPP/maint/README b/src/script_opt/CPP/maint/README
index 9e36f43dd4..0913151dbd 100644
--- a/src/script_opt/CPP/maint/README
+++ b/src/script_opt/CPP/maint/README
@@ -13,7 +13,7 @@ The maintenance workflow:
 
 1.  Make sure the compiler can compile and execute the base scripts:
 
-	echo | src/zeek -O gen-C++
+	src/zeek -O gen-C++ /dev/null
 	ninja
 	src/zeek -O use-C++ -r some.pcap
 
@@ -21,7 +21,7 @@ The maintenance workflow:
 
 	rm CPP-gen.cc
 	ninja
-	echo | src/zeek -O gen-standalone-C++
+	src/zeek -O gen-standalone-C++ /dev/null
 	ninja
 	rm CPP-gen.cc
 	ninja
diff --git a/src/script_opt/ZAM/Ops.in b/src/script_opt/ZAM/Ops.in
index dd092689bf..c1aa43c7bf 100644
--- a/src/script_opt/ZAM/Ops.in
+++ b/src/script_opt/ZAM/Ops.in
@@ -1832,7 +1832,6 @@ op1-read
 type VVV
 eval	auto v = frame[z.v1].subnet_val->AsSubNet().AsString();
 	EvalSwitchBody(str_cases,)
-	auto t = str_cases[z.v2];
 
 
 internal-op Branch-If-Not-Type