Correct various errors in CStruct.

With this, it manages to compose.