address couple of Colm's comments and also to enable compilation and tests

src/backend/distributed/deparser/ruleutils_16.c

@@ -3558,8 +3558,7 @@ get_update_query_targetlist_def(Query *query, List *targetList,
 			else if (!tle->resjunk)
 			{
 				int paramid = 0;
-				if (saw_junk)
-					elog(ERROR, "out of order target list");
+				Assert(!saw_junk)
 
 				paramid = GetParamId((Node *) tle->expr);
 				if (paramid < previous_paramid)

src/backend/distributed/planner/insert_select_planner.c

@@ -1082,11 +1082,6 @@ ReorderInsertSelectTargetLists(Query *originalQuery, RangeTblEntry *insertRte,
 		TargetEntry *newSubqueryTargetEntry = NULL;
 		AttrNumber originalAttrNo = get_attnum(insertRelationId,
 											   oldInsertTargetEntry->resname);
-		Node *expr;
-
-		/* we need to explore the underlying expression */
-		expr = (Node *) oldInsertTargetEntry->expr;
-		expr = strip_implicit_coercions(expr);
 
 		/* we need to explore the underlying expression */
 		Node *expr = strip_implicit_coercions((Node *) oldInsertTargetEntry->expr);