I was actually planning on doing something radical from Cameraleather.com if they're still around. I've worked with them before and their service and quality are outstanding too. If they're gone, I'll look into WTP. The C needed some attention in other areas-fungus in the taking lens, fungus on the exterior of the viewing lens and on the mirror, shutter's acting up a little (can't figure out how to get the front plate off), and the film transport system needed some lubrication. I'll see if I can apply some lube through the holes in the outside of the shutter mechanism VERY carefully.
The Yashica Mat had some fungus in the taking lens. EASILY wiped out. Fired a crappy expired roll through it and have another at the ready. Going to be waiting on having it scanned though, since my scanner's out of commission.