Replace uses of in-string-p; make it obsolete