Rework line/col index handling