(#4791)  Use the existin trim() function.