Refinements for identifier and number processing.
Allow identifier to call number and number to call identifier without header file problems.