Simplify the new Types class.