A couple of tweaks to the FR matcher.