Switch struct defns, to fix a seeming compiler bug