Trim commas and empty lines off address formats Fixes #5411