[Typer] [Git][monnier/typer][master] Be more careful about which grammar to use while parsing