Redid fields and args of sum and product types.  This more or less completes the
restructuring of core.