fix greediness of expression -- probably need to detect escaped quotes better.