`clang-format` doesn't rewrap string literals after changing the
indentation. Do a sweep over the changed lines to reflow strings which
have been affected.

Some minor whitespace changes are also made in order to clean up some of
the string values. Extraneous `<<` operators are also removed in favor
of string literal concatenation.