Fix a regression rendering merged cells.