Remove struct nesting -- gtk-doc and gir don't like it