7ed172336f
Simplifies the code in this area, makes it work better with other C++ code. The max length argument isn't used anymore. But at that point we wouldn't necessarily have a unique name anyway, which opens up for other failures.