Fix the parsing of optional shell parameters. (dm)