Improved regexps.