Remove usage of safe-str-match.