This is a prerequisite for support for interop with C++ template names. No behavior change here, except that it sadly changes the fingerprinting for a lot of tests.