[Typer] [Git][monnier/typer][master] Simplify predef slightly