Remove historic quoting

This resolves #940