More robust regexps