Standardise on using heredocs for long strings

Also fix up the "undentation" of some existing heredocs.