Change remaining instances of str{cat,cpy} to strl{cat,cpy}.