81268ac80e
only in the names (I probably got most of them). I was even generous with some which differed in underscores in names, and probably missed a few, and I *still* was able to remove almost a third of the file with almost no impact on testsuite coverage.