Updates for C conversion.