The last in the set of mini-changes I suspect. :)

These changes bring the code into spec for compiling with gcc 2.95, the oldest compiler we want to have any dealings with. As with the 3.4 changes, these are things which the newer compiler didn't balk at, but which are still not really proper anyways.