Remove legacy line number reports
Reduce node count a bit