You do you! I personally have no issues with the presentation of the initial workaround. My only affected return is too complicated for the IRS matching system to work well, even for something "straightforward" like capital gains passing through on a K-1.