We have only two callers, and for neither this "optimization" is useful. So let's drop it an save some code and a malloc.