Cleanup: switch inline-block+max-width to table-cell where needed