Martin's patch caused GCC to complain if --enable-gcc-warnings is used; I 
installed the attached minor further change.