diff --git a/src/Expr.cc b/src/Expr.cc
index b11f382a33..825f331a8f 100644
--- a/src/Expr.cc
+++ b/src/Expr.cc
@@ -292,7 +292,8 @@ ValPtr NameExpr::Eval(Frame* f) const
 		v = f->GetElementByID(id);
 
 	else
-		// No frame - evaluating for Simplify() purposes
+		// No frame - evaluating for purposes of resolving a
+		// compile-time constant.
 		return nullptr;
 
 	if ( v )
@@ -4353,10 +4354,10 @@ LambdaExpr::LambdaExpr(std::unique_ptr<function_ingredients> arg_ing,
 		const auto& id = global_scope()->Find(fullname);
 
 		if ( id )
-			// Just try again to make a unique lambda name.  If two peer
-			// processes need to agree on the same lambda name, this assumes
-			// they're loading the same scripts and thus have the same hash
-			// collisions.
+			// Just try again to make a unique lambda name.
+			// If two peer processes need to agree on the same
+			// lambda name, this assumes they're loading the same
+			// scripts and thus have the same hash collisions.
 			d.Add(" ");
 		else
 			break;
diff --git a/src/Frame.cc b/src/Frame.cc
index 6694b507fe..12a01bb57e 100644
--- a/src/Frame.cc
+++ b/src/Frame.cc
@@ -263,7 +263,7 @@ Frame* Frame::SelectiveClone(const IDPList& selection, ScriptFunc* func) const
 	// 	other->closure = closure->SelectiveClone(them);
 	// other->outer_ids = outer_ids;
 
-	if( closure )
+	if ( closure )
 		other->CaptureClosure(closure, outer_ids);
 
 	if ( offset_map )
diff --git a/src/parse.y b/src/parse.y
index f5206b752e..1a206674b0 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1288,11 +1288,14 @@ lambda_body:
 			{
 			zeek::detail::set_location(@1, @5);
 
-			// Code duplication here is sad but needed. end_func actually instantiates the function
-			// and associates it with an ID. We perform that association later and need to return
-			// a lambda expression.
+			// Code duplication here is sad but needed.
+			// end_func actually instantiates the function
+			// and associates it with an ID. We perform that
+			// association later and need to return a lambda
+			// expression.
 
-			// Gather the ingredients for a BroFunc from the current scope
+			// Gather the ingredients for a Func from the
+			// current scope.
 			auto ingredients = std::make_unique<zeek::detail::function_ingredients>(
 				zeek::IntrusivePtr{zeek::NewRef{}, zeek::detail::current_scope()},
 				zeek::IntrusivePtr{zeek::AdoptRef{}, $3});