Fix to file2c to ensure valid C identifiers

A couple of small bug fixes.