Parser restructuring