Fix a bunch of places where newline-stripping causes word concat.