handle the naming and use of anonymous C structs better in the wrapper.