Now that we are out of stage 1, the next wave of cleanups will go into the cxx-conversion branch. I figured it was easier to revive this branch than open a new one.
I just merged trunk at rev 193681 and updated the failures manifest in the branch (contrib/testsuite-management/*.xfail) so it's easy to decide whether a cleanup broke any tests. Tested on x86_64. Diego.
