diff --git a/benchtests/Makefile b/benchtests/Makefile
index 3ccd250c403d5bfb05a54fbb43ba0ab850616cce..1afa71bf4a0706fabefe0b1299c164cf4a843472 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -37,7 +37,7 @@ bench := $(foreach B,$(filter bench-%,${BENCHSET}), ${${B}})
Â endif
Â 
Â # String function benchmarks.
-string-benchset := bcopy bzero memccpy memchr memcmp memcpy memmem memmove \
+string-benchset := memccpy memchr memcmp memcpy memmem memmove \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  mempcpy memset rawmemchr stpcpy stpncpy strcasecmp strcasestr \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  strcat strchr strchrnul strcmp strcpy strcspn strlen \
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â  strncasecmp strncat strncmp strncpy strnlen strpbrk strrchr \
diff --git a/benchtests/bench-bcopy.c b/benchtests/bench-bcopy.c
deleted file mode 100644
index 09f923585f2192f1e2a78e7a7bc7a59544603ee6..0000000000000000000000000000000000000000
--- a/benchtests/bench-bcopy.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Measure bcopy functions.
-Â Â  Copyright (C) 2013-2018 Free Software Foundation, Inc.
-Â Â  This file is part of the GNU C Library.
-
-Â Â  The GNU C Library is free software; you can redistribute it and/or
-Â Â  modify it under the terms of the GNU Lesser General Public
-Â Â  License as published by the Free Software Foundation; either
-Â Â  version 2.1 of the License, or (at your option) any later version.
-
-Â Â  The GNU C Library is distributed in the hope that it will be useful,
-Â Â  but WITHOUT ANY WARRANTY; without even the implied warranty of
-Â Â  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.Â  See the GNU
-Â Â  Lesser General Public License for more details.
-
-Â Â  You should have received a copy of the GNU Lesser General Public
-Â Â  License along with the GNU C Library; if not, see
-Â Â  <http://www.gnu.org/licenses/>.Â  */
-
-#define TEST_BCOPY
-#include "bench-memmove.c"
diff --git a/benchtests/bench-bzero.c b/benchtests/bench-bzero.c
deleted file mode 100644
index 70a2e05806b79db1d17057a69a45d22bd6698254..0000000000000000000000000000000000000000
--- a/benchtests/bench-bzero.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Measure bzero functions.
-Â Â  Copyright (C) 2013-2018 Free Software Foundation, Inc.
-Â Â  This file is part of the GNU C Library.
-
-Â Â  The GNU C Library is free software; you can redistribute it and/or
-Â Â  modify it under the terms of the GNU Lesser General Public
-Â Â  License as published by the Free Software Foundation; either
-Â Â  version 2.1 of the License, or (at your option) any later version.
-
-Â Â  The GNU C Library is distributed in the hope that it will be useful,
-Â Â  but WITHOUT ANY WARRANTY; without even the implied warranty of
-Â Â  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.Â  See the GNU
-Â Â  Lesser General Public License for more details.
-
-Â Â  You should have received a copy of the GNU Lesser General Public
-Â Â  License along with the GNU C Library; if not, see
-Â Â  <http://www.gnu.org/licenses/>.Â  */
-#define TEST_BZERO
-#include "bench-memset.c"
diff --git a/benchtests/bench-memccpy.c b/benchtests/bench-memccpy.c
index c7424130d64a5d216866ca6ee5d6dc6923f6d062..a6a856efaea64b60bd71809247e3da345a66ab61 100644
--- a/benchtests/bench-memccpy.c
+++ b/benchtests/bench-memccpy.c
@@ -20,28 +20,8 @@
Â #define TEST_NAME "memccpy"
Â #include "bench-string.h"
Â 
-void *simple_memccpy (void *, const void *, int, size_t);
-void *stupid_memccpy (void *, const void *, int, size_t);
-
-IMPL (stupid_memccpy, 0)
-IMPL (simple_memccpy, 0)
-IMPL (memccpy, 1)
-
-void *
-simple_memccpy (void *dst, const void *src, int c, size_t n)
-{
-Â  const char *s = src;
-Â  char *d = dst;
-
-Â  while (n-- > 0)
-Â Â Â  if ((*d++ = *s++) == (char) c)
-Â Â Â Â Â  return d;
-
-Â  return NULL;
-}
-
Â void *
-stupid_memccpy (void *dst, const void *src, int c, size_t n)
+generic_memccpy (void *dst, const void *src, int c, size_t n)
Â {
Â Â  void *p = memchr (src, c, n);
Â 
@@ -52,6 +32,9 @@ stupid_memccpy (void *dst, const void *src, int c, size_t n)
Â Â  return NULL;
Â }
Â 
+IMPL (memccpy, 1)
+IMPL (generic_memccpy, 0)
+
Â typedef void *(*proto_t) (void *, const void *, int c, size_t);
Â 
Â static void
diff --git a/benchtests/bench-memcpy.c b/benchtests/bench-memcpy.c
index 6a52a1b0a072d06fc51aad9738a3ff2e407682ab..99186d7212936d45582752cad0f0338527192d52 100644
--- a/benchtests/bench-memcpy.c
+++ b/benchtests/bench-memcpy.c
@@ -23,13 +23,6 @@
Â # define TEST_NAME "memcpy"
Â # include "bench-string.h"
Â 
-char *simple_memcpy (char *, const char *, size_t);
-char *builtin_memcpy (char *, const char *, size_t);
-
-IMPL (simple_memcpy, 0)
-IMPL (builtin_memcpy, 0)
-IMPL (memcpy, 1)
-
Â char *
Â simple_memcpy (char *dst, const char *src, size_t n)
Â {
@@ -44,6 +37,11 @@ builtin_memcpy (char *dst, const char *src, size_t n)
Â {
Â Â  return __builtin_memcpy (dst, src, n);
Â }
+
+IMPL (memcpy, 1)
+IMPL (builtin_memcpy, 0)
+IMPL (simple_memcpy, 0)
+
Â #endif
Â 
Â # include "json-lib.h"
diff --git a/benchtests/bench-memmove.c b/benchtests/bench-memmove.c
index 93de6719811d1226bc264462ab4b2508ce5c6b15..ce9dd1e8ebc3a537bc2aa4830712ac8065b75066 100644
--- a/benchtests/bench-memmove.c
+++ b/benchtests/bench-memmove.c
@@ -17,34 +17,16 @@
Â Â Â  <http://www.gnu.org/licenses/>.Â  */
Â 
Â #define TEST_MAIN
-#ifdef TEST_BCOPY
-# define TEST_NAME "bcopy"
-#else
-# define TEST_NAME "memmove"
-#endif
+#define TEST_NAME "memmove"
Â #include "bench-string.h"
Â #include "json-lib.h"
Â 
Â char *simple_memmove (char *, const char *, size_t);
Â 
-#ifdef TEST_BCOPY
-typedef void (*proto_t) (const char *, char *, size_t);
-void simple_bcopy (const char *, char *, size_t);
-
-IMPL (simple_bcopy, 0)
-IMPL (bcopy, 1)
-
-void
-simple_bcopy (const char *src, char *dst, size_t n)
-{
-Â  simple_memmove (dst, src, n);
-}
-#else
Â typedef char *(*proto_t) (char *, const char *, size_t);
Â 
-IMPL (simple_memmove, 0)
Â IMPL (memmove, 1)
-#endif
+IMPL (simple_memmove, 0)
Â 
Â char *
Â inhibit_loop_to_libcall
@@ -74,11 +56,7 @@ do_one_test (json_ctx_t *json_ctx, impl_t *impl, char *dst, char *src, const
Â Â  TIMING_NOW (start);
Â Â  for (i = 0; i < iters; ++i)
Â Â Â Â  {
-#ifdef TEST_BCOPY
-Â Â Â Â Â  CALL (impl, src, dst, len);
-#else
Â Â Â Â Â Â  CALL (impl, dst, src, len);
-#endif
Â Â Â Â  }
Â Â  TIMING_NOW (stop);
Â 
diff --git a/benchtests/bench-mempcpy.c b/benchtests/bench-mempcpy.c
index bb76881b5e18a4bf0e8234e15271f1bc346aa981..230a8af8cc98b9f33f4c363d018b57067047bfac 100644
--- a/benchtests/bench-mempcpy.c
+++ b/benchtests/bench-mempcpy.c
@@ -21,17 +21,13 @@
Â #define TEST_NAME "mempcpy"
Â #include "bench-string.h"
Â 
-char *simple_mempcpy (char *, const char *, size_t);
-
-IMPL (simple_mempcpy, 0)
-IMPL (mempcpy, 1)
-
Â char *
-simple_mempcpy (char *dst, const char *src, size_t n)
+generic_mempcpy (char *dst, const char *src, size_t n)
Â {
-Â  while (n--)
-Â Â Â  *dst++ = *src++;
-Â  return dst;
+Â  return memcpy (dst, src, n) + n;
Â }
Â 
+IMPL (mempcpy, 1)
+IMPL (generic_mempcpy, 0)
+
Â #include "bench-memcpy.c"
diff --git a/benchtests/bench-memset.c b/benchtests/bench-memset.c
index 85bb2b314a98827f6a19e073212ecb56801e3c4e..f9348fc1e26a3809efb5370e54dca7f4324bd87f 100644
--- a/benchtests/bench-memset.c
+++ b/benchtests/bench-memset.c
@@ -17,66 +17,32 @@
Â Â Â  <http://www.gnu.org/licenses/>.Â  */
Â 
Â #define TEST_MAIN
-#ifdef TEST_BZERO
-# define TEST_NAME "bzero"
-#else
-# ifndef WIDE
-#Â  define TEST_NAME "memset"
-# else
-#Â  define TEST_NAME "wmemset"
-# endif /* WIDE */
-#endif /* !TEST_BZERO */
-#define MIN_PAGE_SIZE 131072
-#include "bench-string.h"
-
Â #ifndef WIDE
-# define SIMPLE_MEMSET simple_memset
+# define TEST_NAME "memset"
Â #else
-# define SIMPLE_MEMSET simple_wmemset
+# define TEST_NAME "wmemset"
Â #endif /* WIDE */
+#define MIN_PAGE_SIZE 131072
+#include "bench-string.h"
Â 
Â #include "json-lib.h"
Â 
Â CHAR *SIMPLE_MEMSET (CHAR *, int, size_t);
Â 
-#ifdef TEST_BZERO
-typedef void (*proto_t) (char *, size_t);
-void simple_bzero (char *, size_t);
-void builtin_bzero (char *, size_t);
-
-IMPL (simple_bzero, 0)
-IMPL (builtin_bzero, 0)
-IMPL (bzero, 1)
-
-void
-simple_bzero (char *s, size_t n)
-{
-Â  SIMPLE_MEMSET (s, 0, n);
-}
-
-void
-builtin_bzero (char *s, size_t n)
-{
-Â  __builtin_bzero (s, n);
-}
-#else
Â typedef CHAR *(*proto_t) (CHAR *, int, size_t);
Â 
-IMPL (SIMPLE_MEMSET, 0)
-# ifndef WIDE
-char *builtin_memset (char *, int, size_t);
-IMPL (builtin_memset, 0)
-# endif /* !WIDE */
Â IMPL (MEMSET, 1)
+IMPL (SIMPLE_MEMSET, 0)
Â 
-# ifndef WIDE
+#ifndef WIDE
Â char *
Â builtin_memset (char *s, int c, size_t n)
Â {
Â Â  return __builtin_memset (s, c, n);
Â }
-# endif /* !WIDE */
-#endif /* !TEST_BZERO */
+
+IMPL (builtin_memset, 0)
+#endif /* !WIDE */
Â 
Â CHAR *
Â inhibit_loop_to_libcall
@@ -95,14 +61,12 @@ do_one_test (json_ctx_t *json_ctx, impl_t *impl, CHAR *s,
Â Â  size_t i, iters = INNER_LOOP_ITERS;
Â Â  timing_t start, stop, cur;
Â 
+Â  memset (s, 0, n);
+
Â Â  TIMING_NOW (start);
Â Â  for (i = 0; i < iters; ++i)
Â Â Â Â  {
-#ifdef TEST_BZERO
-Â Â Â Â Â  CALL (impl, s, n);
-#else
Â Â Â Â Â Â  CALL (impl, s, c, n);
-#endif /* !TEST_BZERO */
Â Â Â Â  }
Â Â  TIMING_NOW (stop);
Â 
@@ -159,9 +123,7 @@ test_main (void)
Â 
Â Â  json_array_begin (&json_ctx, "results");
Â 
-#ifndef TEST_BZERO
Â Â  for (c = -65; c <= 130; c += 65)
-#endif
Â Â Â Â  {
Â Â Â Â Â Â  for (i = 0; i < 18; ++i)
Â Â Â Â Â Â Â Â  do_test (&json_ctx, 0, c, 1 << i);
diff --git a/benchtests/bench-rawmemchr.c b/benchtests/bench-rawmemchr.c
index 8664fe51078b236bac0455ee988f781dac5ea7d0..5a7d607040229f1199ab9b2c504f051dea426021 100644
--- a/benchtests/bench-rawmemchr.c
+++ b/benchtests/bench-rawmemchr.c
@@ -23,20 +23,18 @@
Â #include "bench-string.h"
Â 
Â typedef char *(*proto_t) (const char *, int);
-char *simple_rawmemchr (const char *, int);
-
-IMPL (simple_rawmemchr, 0)
-IMPL (rawmemchr, 1)
Â 
Â char *
-simple_rawmemchr (const char *s, int c)
+generic_rawmemchr (const char *s, int c)
Â {
-Â  while (1)
-Â Â Â  if (*s++ == (char) c)
-Â Â Â Â Â  return (char *) s - 1;
-Â  return NULL;
+Â  if (c != 0)
+Â Â Â  return memchr (s, c, PTRDIFF_MAX);
+Â  return (char *)s + strlen (s);
Â }
Â 
+IMPL (rawmemchr, 1)
+IMPL (generic_rawmemchr, 0)
+
Â static void
Â do_one_test (impl_t *impl, const char *s, int c, char *exp_res)
Â {
