Better quote handling.