More command line input escaping