Tighten up regexps