De-macroize some structs in input/