Split mailing label formatting out from main format

Split mailing label formatting out from main format

Splitting these 2 functions out allows cleanup & eventual decommissioning of the mailing label
function.

There are siginificant usage differences depending on context so this will permit
cleanup - I did a universe search & these are the only 2 times it is called with
mailing = TRUE