Some cleanups to CStruct.