Give a warning if -s switch is used with a non-custom pgbench test.

Also, clean up the code that assigned the scale into :scale variables.
Greg Smith and Tom Lane