asterisk users - Dec 2004 - Incoming TypeOfNumber on zap, not just iax2?

>From reading the source it seems that the incoming calling number TON/NPI 
are not copied from the notification from libpri.

In chan_zap.c the callerid is copied from e->ring.callingname to 
pri->pvts[chanpos]->cid_num in pri_dchannel. However, the ring.callingplan
is not stored anywhere. 

If one grep for cid_ton the only hits are from pbx.c (where CALLINGTON is 
read out), chan_iax2.c (read on incoming iax connections), and 
apps/app_dial.c (copied on bridge). From what I can see the data from 
libpri is never used by asterisk. 

Does the CALLINGTON variable work for anybody?

Peter