Remove as much manual shell quoting as possible