Split type expansion into ExpandInteger and ExpandFloat