add a new callerId attribute to Channel.  while at it, clean up a number of caller-ID-related things