Fix moving right from cell with colSpan > 1.

Rather than increasing cellIndex by 1, it is now increased by
the value of the colSpan property.