Add shellword escaping