Improve bench-strstr