lint fixes from Guy Harris, getting it to run under SunOS