Parser code folding fix