Merge left and right padding into one table.
Remove obsolete TODO comments.