Correct fix for debug quoting (now we don't get double quoting everywhere)