normalize quoting

another round of quoting around :)
yes, see #32