Use String.quote uniformly