Better handling for shell characters within argument replacements