Clean up double-quotes around column and table names.

 Had too many in some cases because there was already a routine
 taking care of it.