Long lines were fixed in a very crude way, as I'll be following up with another reformat in a bit.
It assumed node_ids increased monotonically for locals, but macros make this no longer the case, and it was a dubious assumption anyway. It now numbers locals itself and uses that to determine which precede which.
