PDF Statement: Extra commas

Every time I run a PDF statement--either Sales or Purchases--extra commas appear after street address and town. This is because I have to add commas to those fields in Settings--Organisation--Details & tax--Trading address so they appear on our invoices (we don't use headers). But they are obviously coded into the PDF statement and therefore I have to go take out the commas and then remember to put them back in. (Can't tell you the number of times I've forgotten one or the other or then forgot to Save changes.)

Is there something I can do so I don't have to faff around with settings each time? It may just be a case of changing the invoice header details so those commas I need are automatically there--but I just couldn't figure it out myself.

Any advice very much appreciated! Thanks.