printer: use wrap
util function in more places
#2934
Merged
wrap
util function in more places
#2934