Added keeping of line number in non terminal tokens