Merge "Replace a use of index with strchr."