Set currentLine to null after adding it in BlockArea. Some cosmetical rearrangements. PR: 17472 and several postings