Address Stew's concerns on command line