strengthen regexps a bit