Regex tweaks.