Now properly handles quoted arguments