Bug 1004505 - Avoid double-quoting variables, resulting in invalid JSON....

... r=timdream