Complex command args are now properly parsed