Fix formatter regression with message_lines

Fixes #1522, seems I missed the importance of some string interpolation when originally extracting this. The cuke change is actually a reversion of another commit that allowed this regression to slip out.