Fix the usage formatter when using --expand

Add a scenario to the usage formatter feature for the --expand case,
and update the usage formatter to pass this scenario.