Minor mods to make output closer to standard vCard