diff --git a/src/jrd/cmp.cpp b/src/jrd/cmp.cpp
index 69f6eaf52b..91c212da03 100644
--- a/src/jrd/cmp.cpp
+++ b/src/jrd/cmp.cpp
@@ -1990,8 +1990,7 @@ jrd_req* CMP_make_request(thread_db* tdbb, CompilerScratch* csb)
 	// optimizations can be performed here.
 
 	DEBUG;
-	jrd_nod* node = pass1(tdbb, csb, csb->csb_node, 0, 0, false);
-	csb->csb_node = node;
+	csb->csb_node = pass1(tdbb, csb, csb->csb_node, 0, 0, false);
 	csb->csb_impure = REQ_SIZE + REQ_TAIL * csb->csb_n_stream;
 	csb->csb_exec_sta.clear();
 	csb->csb_node = pass2(tdbb, csb, csb->csb_node, 0);
diff --git a/src/jrd/opt.cpp b/src/jrd/opt.cpp
index 047f43b196..c1c1c1f911 100644
--- a/src/jrd/opt.cpp
+++ b/src/jrd/opt.cpp
@@ -824,7 +824,6 @@ RecordSource* OPT_compile(thread_db*		tdbb,
 			}
 		}
 
-
 		// attempt to form joins in decreasing order of desirability
 		gen_join(tdbb, opt, streams, rivers_stack, &sort, &project,
 				 rse->rse_plan);