Cleanup a whole bunch of unnecessary quoting.