Remove Doc.addLine(), move utilities.