Changed token matcher.