Slightly improved regexps.