clean up string concatenation in logging
merge from 1.2
generify