More C-ification...

A fix and one more line.  I just couldn't resist!