Good point. I found the usages of `indexOf`. Makes sense to address them together.