Use more standard indexOf-as-contains idiom