Merge "Replaces uses of index() with strchr()."