Clean up types.