Starting work on proper line-numbering support.