Fix cmdline expand keyword to use cmd.name.