I still think TurboTax could improve here. The premise of the software is "enter your forms exactly as you received them, and TurboTax computes your tax". Having to do your own computations and enter a form values that synthesize several forms that you received is contrary to this premise.
This issue also consumes so much support time. Last year dozens of support threads were created on the topic and I expect the same this year. Seems more efficient to just have your engineering team make the improvement.
