More work quoting things for bug #8365.