The order seems to be important here.
However it has worked for me and I am not sure this will fix tinderboxes.

...the same way cpp_uno/gcc3_linux_x86-64 was already adapted.

Rename twice and also check if upon renaming two tables have the same name or not

Revert "Clang WaE: -Woverloaded-virtual weirdness, this seems to help"
as that broke tinderboxes. Try another way instead, renaming two
versions of the overloaded render() method, so that there is no longer
any overloading.

Compiles -Werror-clean with Clang, hopefully no problem with other
compilers either.

This reverts commit 86b99ab4.

I hope this will keep Stephan's tinderbox happy.  If not...

Recover the code that was for some reason removed in commit
78e8d5f0.