Cleanup quoting some more.