Eliminate strcat here too.