[11.x] Use Str::wrap() instead of nesting Str::start() inside Str::finish()

[11.x] Use Str::wrap() instead of nesting Str::start() inside Str::finish() #8582