Regex improvements.