Changes in source to be friendlier to older C compilers