Move expansion into command reporting