diff --git a/src/backend/distributed/executor/citus_custom_scan.c b/src/backend/distributed/executor/citus_custom_scan.c
index e2742c7d9..968b22102 100644
--- a/src/backend/distributed/executor/citus_custom_scan.c
+++ b/src/backend/distributed/executor/citus_custom_scan.c
@@ -183,8 +183,8 @@ CitusModifyBeginScan(CustomScanState *node, EState *estate, int eflags)
 	 * executions of a prepared statement. Instead we create a deep copy that we only
 	 * use for the current execution.
 	 */
-	DistributedPlan *distributedPlan = scanState->distributedPlan = copyObject(
-		scanState->distributedPlan);
+	DistributedPlan *distributedPlan = copyObject(scanState->distributedPlan);
+	scanState->distributedPlan = distributedPlan;
 
 	Job *workerJob = distributedPlan->workerJob;
 	Query *jobQuery = workerJob->jobQuery;
diff --git a/src/backend/distributed/test/fake_fdw.c b/src/backend/distributed/test/fake_fdw.c
index 22a4960e1..e8c011820 100644
--- a/src/backend/distributed/test/fake_fdw.c
+++ b/src/backend/distributed/test/fake_fdw.c
@@ -118,7 +118,10 @@ FakeGetForeignPlan(PlannerInfo *root, RelOptInfo *baserel, Oid foreigntableid,
  * FakeBeginForeignScan begins the fake plan (i.e. does nothing).
  */
 static void
-FakeBeginForeignScan(ForeignScanState *node, int eflags) { }
+FakeBeginForeignScan(ForeignScanState *node, int eflags)
+{
+	/* this comment is for indentation consistency */
+}
 
 
 /*
@@ -138,11 +141,17 @@ FakeIterateForeignScan(ForeignScanState *node)
  * FakeReScanForeignScan restarts the fake plan (i.e. does nothing).
  */
 static void
-FakeReScanForeignScan(ForeignScanState *node) { }
+FakeReScanForeignScan(ForeignScanState *node)
+{
+	/* this comment is for indentation consistency */
+}
 
 
 /*
  * FakeEndForeignScan ends the fake plan (i.e. does nothing).
  */
 static void
-FakeEndForeignScan(ForeignScanState *node) { }
+FakeEndForeignScan(ForeignScanState *node)
+{
+	/* this comment is for indentation consistency */
+}
diff --git a/src/backend/distributed/utils/citus_copyfuncs.c b/src/backend/distributed/utils/citus_copyfuncs.c
index 1a2083989..22e9901cc 100644
--- a/src/backend/distributed/utils/citus_copyfuncs.c
+++ b/src/backend/distributed/utils/citus_copyfuncs.c
@@ -33,8 +33,8 @@ CitusSetTag(Node *node, int tag)
 
 
 #define DECLARE_FROM_AND_NEW_NODE(nodeTypeName) \
-	nodeTypeName *newnode = (nodeTypeName *) \
-							CitusSetTag((Node *) target_node, T_ ## nodeTypeName); \
+	nodeTypeName *newnode = \
+		(nodeTypeName *) CitusSetTag((Node *) target_node, T_ ## nodeTypeName); \
 	nodeTypeName *from = (nodeTypeName *) source_node
 
 /* Copy a simple scalar field (int, float, bool, enum, etc) */