Now properly handling all line terminators after last comma