chan_pjsip/res_pjsip_callerid: Make Party ID handling simpler and consistent.