Further C code cleanups.