oops

Sorry about including the regression test changes in that last patch - just
ignore them.

Since sending in that last patch, I've fixed preproc.y to use 5 instead of 6
as the number of params to concatenate...

Chris