Move to single regexes for Chrome 16-23 and FF 9-16.