asterisk users - Jul 2009 - odd T1 issue

Howdy,

Just installed a new switch in a new location (Ubuntu, 2.6.24-24 kernel, 
zaptel 1.4.12.1 built from source, libpri-1.4.10.1 built from source, 
asterisk 1.4.26 built from source, wanpipe 3.5.4 built from source, 
Sangoma A104d with firmware that is probably a year old).

I plugged in an RBS T1, ESF, B8ZS, wink start, and MF signalling.  I stuck 
with the defaults that the wanpipe build wrote in zaptel.conf when I told 
it ESF, B8ZS, and E&M Wink:
---
loadzone=us
defaultzone=us
#Sangoma A104 port 1 [slot:6 bus:2 span:1] <wanpipe1>
span=1,0,0,esf,b8zs
e&m=1-24
---

But I changed the "signalling" line in zapata.conf because with 
"signalling=em_w" I couldn't place any outbound calls and all
inbound
calls, though they worked, were sending "33" as the DID number no
matter
what DID was called.  So after trying a few different signalling methods, 
I found that:

;Sangoma A104 port 1 [slot:6 bus:2 span:1] <wanpipe1>
context=from-pstn
group=0
;signalling=em_w
signalling=featb
channel => 1-24

Allowed me to place outbound calls with no problems.  Inbound calls, 
however, now do give me all the digits of the DID number dialed, but with 
the odd "33" interspersed.  For example when the DID number is 715
7600 I
get (in the CLI):

Connected to Asterisk 1.4.26 currently running on vigw-crown1 (pid = 5515)
Verbosity is at least 100
Core debug is at least 100
     -- Starting simple switch on 'Zap/10-1'
     -- Executing [731573600 at from-pstn:1] Dial("Zap/10-1",
"SIP/231") in
new stack
     -- Called 231
     -- SIP/231-081d1108 is ringing
   == Spawn extension (from-pstn, 731573600, 1) exited non-zero on 
'Zap/10-1'
     -- Hungup 'Zap/10-1'

And when the DID number is 715 7999, I get:

     -- Starting simple switch on 'Zap/11-1'
     -- Executing [731573999 at from-pstn:1] Dial("Zap/11-1",
"SIP/231") in
new stack
     -- Called 231
     -- SIP/231-081d1108 is ringing
   == Spawn extension (from-pstn, 731573999, 1) exited non-zero on 
'Zap/11-1'
     -- Hungup 'Zap/11-1'

I matched all entries with _X. in extensions.conf and had them ring a SIP 
phone as you can see above, just to see what I was given by the carrier.

It is perfectly consistent, so I *could* get by with matching the stupid 
3's, but obviously I would rather not leave it this way.  Any ideas?

Thanks,

j