Correct arguments passed to top-level commands that need them