Improve command escaping.