String match/StartsWith/EndsWith API cleanup