Added command line expansion.