fix fallout from line number changes.