Thanks!
If you make the basis at year-beginning the difference between taxable and non-taxable, and the basis at year-end be $0, it works out correctly.
(Which makes sense if you stop and think about it.)
