More sane construction of structs