More unbreaking regexes.