Remove helper typedefs.