I unmarked this as the solution because IRS will be releasing an actual worksheet that will be incorporated into software soon. The only thing we can do is wait for these companies to update the forms.
