Fix #7113. Patch by Łukasz Langa.

Changes include using a list of lines instead of patching together using
string interpolation, and a multi-line value test cases.