Refactor Args to use two Dictionary<string, Action>s

One each for long and short forms