Tidy up ancient checks in macro-user-callerid, add minor D&U fix