diff --git a/src/include/executor/execExpr.h b/src/include/executor/execExpr.h
index 191d8fe34d..594cdc2bcb 100644
--- a/src/include/executor/execExpr.h
+++ b/src/include/executor/execExpr.h
@@ -424,8 +424,8 @@ typedef struct ExprEvalStep
 		struct
 		{
 			ExecEvalSubroutine paramfunc;	/* add-on evaluation subroutine */
-			void	   *paramarg;	/* private data for same */
-			void	   *paramarg2;	/* more private data for same */
+			void	   *exprarg;	/* private data for PLpgSQL_expr* */
+			void	   *paramarg;	/* more private data for Param* */
 			int			paramid;	/* numeric ID for parameter */
 			Oid			paramtype;	/* OID of parameter's datatype */
 		}			cparam;
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index d4377ceecb..ddc8e511cc 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -6505,8 +6505,8 @@ plpgsql_param_compile(ParamListInfo params, Param *param,
 	 * pointers to the PLpgSQL_expr as well as this specific Param, to support
 	 * plpgsql_param_eval_var_check().
 	 */
-	scratch.d.cparam.paramarg = expr;
-	scratch.d.cparam.paramarg2 = param;
+	scratch.d.cparam.exprarg = expr;
+	scratch.d.cparam.paramarg = param;
 	scratch.d.cparam.paramid = param->paramid;
 	scratch.d.cparam.paramtype = param->paramtype;
 	ExprEvalPushStep(state, &scratch);
@@ -6550,8 +6550,8 @@ plpgsql_param_eval_var_check(ExprState *state, ExprEvalStep *op,
 	if (!var->isnull &&
 		VARATT_IS_EXTERNAL_EXPANDED_RW(DatumGetPointer(var->value)))
 	{
-		PLpgSQL_expr *expr = (PLpgSQL_expr *) op->d.cparam.paramarg;
-		Param	   *param = (Param *) op->d.cparam.paramarg2;
+		PLpgSQL_expr *expr = (PLpgSQL_expr *) op->d.cparam.exprarg;
+		Param	   *param = (Param *) op->d.cparam.paramarg;
 
 		/*
 		 * We might have already figured this out while evaluating some other