More fixing of things for bug #8365.  Everything should be quoted now.