The core address block leaves blank lines for fields that don't exist ie
streetname
City
Country
could be
34 High st
US
if there is no city
There is actually an extension available with tokens for this -
https://github.com/eileenmcnaughton/nz.co.fuzion.civitoken
But, it adds a bunch of other tokens too - I think I should make it possible to disable those other tokens before installing
Address tokens
Date tokens (also useful)
(many many other tokens)