Combine adjacent strings into one string

Black has a bug such that strings that were previously multiple lines
sometimes end up as adjacent strings on one line. See:

https://github.com/psf/black/issues/26