[James Youngman]

I'm applying these patches now, to avoid marge conflicts later.  The
effect of these changes is that "make syntax-check" will no longer
complain about the result of "make indent".