First Jörn's updates were applied, then

my take at removing the private functions from the list, then I renamed
the *str(n)equal functions...