Refactor Args classes; translate some blocks as static