Infinitive parsing fixed and lo que case handled.