2016 Form 8606 line 22 should be R + X. However, lines 23 and 25 will be zero (they are not permitted to be less than zero). TurboTax probably won't bother populating line 24 because line 23 is zero.
In 2017, your net Roth IRA basis will be R = R + X - X which would appear on 2017 Form 8606 line 22 should you make a nonqualified Roth IRA distribution in 2017.
