Codequoting fixes

Previous breakage report was not exhaustive