cleanup struct initialization to avoid ifdefs