Factor out the definition of the default string trim set; define it once only.
merge main working branch