Clean up typedefs.