Tighten the regexes a bit.