Refactor Args classes; translate some blocks as static

Be consistant, "cl" or "cli".