Add quotes to preserve more sane quoting in what we pass through.

@lavalamp, this one's for you ;) [again]