Make displayNames() more useful.

Adding empty entries for address-only entries makes no sense, which might
explain why this method isn't used anywhere and we instead have horribly
inefficient workarounds that parse the header again manually to turn it
into the desired output. Add the address instead in those cases.