Added better quote detection.