Regex improvements for quoted strings