Finish up commit from revision 81452 by removing last remnants of strlcat/strlcpy...