Fix up some string assembly - the stringbuilder isn't buying us anything, and rename wrap() to quote()