Improve code output, and reuse mangle-quote