More work on the line numbering that I had to break to make indents work