Clean up more really old and ugly C code...