Working on 2017 amendment in ProSeries for a return with this same situation.  The original return shows a second column country entered on both 1116 forms. On the Passive, the second column for HTKO has negative amounts. On the General, the second column has HTKO with the income added back. I'm not far enough into the return to see if ProSeries likes it.