fixup typedef manner