There may be a place within the program to tell it to not carry that amount to line 16, because I think the instructions for 1041 still say this is a deduction and to enter it.
Back in 2018 the IRS came out with notice 2018-61 that tried to address the issue to which the AICPA wrote a letter requesting that IRS and Treasury issue regulations as additional guidance. To date, as far as I am aware, the IRS and Treasury have not responded or issued any further guidance.
Tom, I was thinking of you too as I respond to this topic. Sorry to not be able to provide more definitive answers.
https://www.aicpa.org/content/dam/aicpa/advocacy/tax/downloadabledocuments/20181031-comment-letter-on-notice-2018-61.pdf
https://www.irs.gov/pub/irs-drop/n-18-61.pdf
https://www.law.cornell.edu/cfr/text/26/1.642(h)-2