Migrate Form 940 to new fill_out() convention