Tightening up some matches to reduce false replacements.