Get rid of a few C-style struct declarations