fix some C++'isms that slipped into C code. C99'isms are allowed, but C++ really isn't...