Follow-up to feature #5835: Fix formatting and remove superfluous wrap in tslib_conte...