This makes the header simpler, and silences `hs-bindgen` notices about "squashed" typedefs.
Avoids the worst part of the header hack, and makes Haskell wrapper simpler.