[Typer] [Git][monnier/typer][master] Fix Macro handling. Removed some dead code