Still a problem in 1.5.1 and these fixes no longer work. At least in terms of referring to certain lines, since it seems the line ordering has changed.
