Regress: Fix persisting GPDB4.1 issue with Margins

Commit 4970c23 did not completely fix the problem with GPDB4.1 for
marginal effects. This commit finishes that task.