Replace ExpandScalarFormalArgs and ExpandScalarCallArgs with the newly