Retirement tax questions

Line 4a should be actual amount of  total 1099-R distributions excluding pension, Line 4b captures pension and and ONLY taxable amount of total 1099-R distributions. Since 2018 1040 no longer has separate pension  line as reported in previous years, I believe that is the way 1040 should be reported.