Fix handling extra table columns.