Updates to QUOTE handling.