Updated quoting to work with subshell junk