Remove typedefs to use plain structs

I don't like typedefs.  Go back to using explicit structs; makes things
clearer about what types are what.