updated the regressions with regards to 9373, the crash on double contexts, and brought other regressions up to date

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59234 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 903 insertions, 903 deletions

diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
index 2071f7727..968c71d82 100644
--- a/pbx/ael/ael-test/ref.ael-vtest13
+++ b/pbx/ael/ael-test/ref.ael-vtest13
@@ -14,17 +14,17 @@ FWDVMBOX=1
 exten => s,1,Set(ext=${ARG1})
 exten => s,2,Set(dev=${ARG2})
 exten => s,3,Dial(${dev}/${ext}|20)
-exten => s,4,Goto(sw-1-${DIALSTATUS}|1)
+exten => s,4,Goto(sw-1-${DIALSTATUS}|10)
 exten => s,5,NoOp(Finish switch-std-exten-1)
 exten => s,6,Return()
 exten => a,1,VoiceMailMain(${ext})
-exten => _sw-1-.,1,Voicemail(u${ext})
-exten => _sw-1-.,2,Goto(s|5)
-exten => sw-1-ANSWER,1,Goto(s|5)
-exten => sw-1-NOANSWER,1,Voicemail(u${ext})
-exten => sw-1-NOANSWER,2,Goto(s|5)
-exten => sw-1-BUSY,1,Voicemail(b${ext})
-exten => sw-1-BUSY,2,Goto(s|5)
+exten => _sw-1-.,10,Voicemail(u${ext})
+exten => _sw-1-.,11,Goto(s|5)
+exten => sw-1-ANSWER,10,Goto(s|5)
+exten => sw-1-NOANSWER,10,Voicemail(u${ext})
+exten => sw-1-NOANSWER,11,Goto(s|5)
+exten => sw-1-BUSY,10,Voicemail(b${ext})
+exten => sw-1-BUSY,11,Goto(s|5)
 
 
 [std-priv-exten_1]
@@ -36,20 +36,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-3-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-3-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_1-3)
 exten => s,11,Return()
-exten => _sw-3-.,1,Voicemail(u${ext})
-exten => _sw-3-.,2,Goto(s|10)
-exten => sw-3-NOANSWER,1,Voicemail(u${ext})
-exten => sw-3-NOANSWER,2,Goto(s|10)
-exten => sw-3-ANSWER,1,Goto(s|10)
-exten => sw-3-BUSY,1,Voicemail(b${ext})
-exten => sw-3-BUSY,2,Goto(s|10)
-exten => sw-3-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-3-DONTCALL,2,Goto(s|10)
-exten => sw-3-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-3-TORTURE,2,Goto(s|10)
+exten => _sw-3-.,10,Voicemail(u${ext})
+exten => _sw-3-.,11,Goto(s|10)
+exten => sw-3-NOANSWER,10,Voicemail(u${ext})
+exten => sw-3-NOANSWER,11,Goto(s|10)
+exten => sw-3-ANSWER,10,Goto(s|10)
+exten => sw-3-BUSY,10,Voicemail(b${ext})
+exten => sw-3-BUSY,11,Goto(s|10)
+exten => sw-3-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-3-DONTCALL,11,Goto(s|10)
+exten => sw-3-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-3-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_2]
@@ -61,20 +61,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-4-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-4-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_2-4)
 exten => s,11,Return()
-exten => _sw-4-.,1,Voicemail(u${ext})
-exten => _sw-4-.,2,Goto(s|10)
-exten => sw-4-NOANSWER,1,Voicemail(u${ext})
-exten => sw-4-NOANSWER,2,Goto(s|10)
-exten => sw-4-ANSWER,1,Goto(s|10)
-exten => sw-4-BUSY,1,Voicemail(b${ext})
-exten => sw-4-BUSY,2,Goto(s|10)
-exten => sw-4-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-4-DONTCALL,2,Goto(s|10)
-exten => sw-4-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-4-TORTURE,2,Goto(s|10)
+exten => _sw-4-.,10,Voicemail(u${ext})
+exten => _sw-4-.,11,Goto(s|10)
+exten => sw-4-NOANSWER,10,Voicemail(u${ext})
+exten => sw-4-NOANSWER,11,Goto(s|10)
+exten => sw-4-ANSWER,10,Goto(s|10)
+exten => sw-4-BUSY,10,Voicemail(b${ext})
+exten => sw-4-BUSY,11,Goto(s|10)
+exten => sw-4-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-4-DONTCALL,11,Goto(s|10)
+exten => sw-4-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-4-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_3]
@@ -86,20 +86,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-5-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-5-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_3-5)
 exten => s,11,Return()
-exten => _sw-5-.,1,Voicemail(u${ext})
-exten => _sw-5-.,2,Goto(s|10)
-exten => sw-5-NOANSWER,1,Voicemail(u${ext})
-exten => sw-5-NOANSWER,2,Goto(s|10)
-exten => sw-5-ANSWER,1,Goto(s|10)
-exten => sw-5-BUSY,1,Voicemail(b${ext})
-exten => sw-5-BUSY,2,Goto(s|10)
-exten => sw-5-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-5-DONTCALL,2,Goto(s|10)
-exten => sw-5-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-5-TORTURE,2,Goto(s|10)
+exten => _sw-5-.,10,Voicemail(u${ext})
+exten => _sw-5-.,11,Goto(s|10)
+exten => sw-5-NOANSWER,10,Voicemail(u${ext})
+exten => sw-5-NOANSWER,11,Goto(s|10)
+exten => sw-5-ANSWER,10,Goto(s|10)
+exten => sw-5-BUSY,10,Voicemail(b${ext})
+exten => sw-5-BUSY,11,Goto(s|10)
+exten => sw-5-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-5-DONTCALL,11,Goto(s|10)
+exten => sw-5-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-5-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_4]
@@ -111,20 +111,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-6-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-6-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_4-6)
 exten => s,11,Return()
-exten => _sw-6-.,1,Voicemail(u${ext})
-exten => _sw-6-.,2,Goto(s|10)
-exten => sw-6-NOANSWER,1,Voicemail(u${ext})
-exten => sw-6-NOANSWER,2,Goto(s|10)
-exten => sw-6-ANSWER,1,Goto(s|10)
-exten => sw-6-BUSY,1,Voicemail(b${ext})
-exten => sw-6-BUSY,2,Goto(s|10)
-exten => sw-6-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-6-DONTCALL,2,Goto(s|10)
-exten => sw-6-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-6-TORTURE,2,Goto(s|10)
+exten => _sw-6-.,10,Voicemail(u${ext})
+exten => _sw-6-.,11,Goto(s|10)
+exten => sw-6-NOANSWER,10,Voicemail(u${ext})
+exten => sw-6-NOANSWER,11,Goto(s|10)
+exten => sw-6-ANSWER,10,Goto(s|10)
+exten => sw-6-BUSY,10,Voicemail(b${ext})
+exten => sw-6-BUSY,11,Goto(s|10)
+exten => sw-6-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-6-DONTCALL,11,Goto(s|10)
+exten => sw-6-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-6-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_5]
@@ -136,20 +136,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-7-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-7-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_5-7)
 exten => s,11,Return()
-exten => _sw-7-.,1,Voicemail(u${ext})
-exten => _sw-7-.,2,Goto(s|10)
-exten => sw-7-NOANSWER,1,Voicemail(u${ext})
-exten => sw-7-NOANSWER,2,Goto(s|10)
-exten => sw-7-ANSWER,1,Goto(s|10)
-exten => sw-7-BUSY,1,Voicemail(b${ext})
-exten => sw-7-BUSY,2,Goto(s|10)
-exten => sw-7-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-7-DONTCALL,2,Goto(s|10)
-exten => sw-7-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-7-TORTURE,2,Goto(s|10)
+exten => _sw-7-.,10,Voicemail(u${ext})
+exten => _sw-7-.,11,Goto(s|10)
+exten => sw-7-NOANSWER,10,Voicemail(u${ext})
+exten => sw-7-NOANSWER,11,Goto(s|10)
+exten => sw-7-ANSWER,10,Goto(s|10)
+exten => sw-7-BUSY,10,Voicemail(b${ext})
+exten => sw-7-BUSY,11,Goto(s|10)
+exten => sw-7-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-7-DONTCALL,11,Goto(s|10)
+exten => sw-7-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-7-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_6]
@@ -161,20 +161,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-8-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-8-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_6-8)
 exten => s,11,Return()
-exten => _sw-8-.,1,Voicemail(u${ext})
-exten => _sw-8-.,2,Goto(s|10)
-exten => sw-8-NOANSWER,1,Voicemail(u${ext})
-exten => sw-8-NOANSWER,2,Goto(s|10)
-exten => sw-8-ANSWER,1,Goto(s|10)
-exten => sw-8-BUSY,1,Voicemail(b${ext})
-exten => sw-8-BUSY,2,Goto(s|10)
-exten => sw-8-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-8-DONTCALL,2,Goto(s|10)
-exten => sw-8-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-8-TORTURE,2,Goto(s|10)
+exten => _sw-8-.,10,Voicemail(u${ext})
+exten => _sw-8-.,11,Goto(s|10)
+exten => sw-8-NOANSWER,10,Voicemail(u${ext})
+exten => sw-8-NOANSWER,11,Goto(s|10)
+exten => sw-8-ANSWER,10,Goto(s|10)
+exten => sw-8-BUSY,10,Voicemail(b${ext})
+exten => sw-8-BUSY,11,Goto(s|10)
+exten => sw-8-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-8-DONTCALL,11,Goto(s|10)
+exten => sw-8-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-8-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_7]
@@ -186,20 +186,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-9-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-9-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_7-9)
 exten => s,11,Return()
-exten => _sw-9-.,1,Voicemail(u${ext})
-exten => _sw-9-.,2,Goto(s|10)
-exten => sw-9-NOANSWER,1,Voicemail(u${ext})
-exten => sw-9-NOANSWER,2,Goto(s|10)
-exten => sw-9-ANSWER,1,Goto(s|10)
-exten => sw-9-BUSY,1,Voicemail(b${ext})
-exten => sw-9-BUSY,2,Goto(s|10)
-exten => sw-9-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-9-DONTCALL,2,Goto(s|10)
-exten => sw-9-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-9-TORTURE,2,Goto(s|10)
+exten => _sw-9-.,10,Voicemail(u${ext})
+exten => _sw-9-.,11,Goto(s|10)
+exten => sw-9-NOANSWER,10,Voicemail(u${ext})
+exten => sw-9-NOANSWER,11,Goto(s|10)
+exten => sw-9-ANSWER,10,Goto(s|10)
+exten => sw-9-BUSY,10,Voicemail(b${ext})
+exten => sw-9-BUSY,11,Goto(s|10)
+exten => sw-9-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-9-DONTCALL,11,Goto(s|10)
+exten => sw-9-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-9-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_8]
@@ -211,20 +211,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-10-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-10-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_8-10)
 exten => s,11,Return()
-exten => _sw-10-.,1,Voicemail(u${ext})
-exten => _sw-10-.,2,Goto(s|10)
-exten => sw-10-NOANSWER,1,Voicemail(u${ext})
-exten => sw-10-NOANSWER,2,Goto(s|10)
-exten => sw-10-ANSWER,1,Goto(s|10)
-exten => sw-10-BUSY,1,Voicemail(b${ext})
-exten => sw-10-BUSY,2,Goto(s|10)
-exten => sw-10-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-10-DONTCALL,2,Goto(s|10)
-exten => sw-10-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-10-TORTURE,2,Goto(s|10)
+exten => _sw-10-.,10,Voicemail(u${ext})
+exten => _sw-10-.,11,Goto(s|10)
+exten => sw-10-NOANSWER,10,Voicemail(u${ext})
+exten => sw-10-NOANSWER,11,Goto(s|10)
+exten => sw-10-ANSWER,10,Goto(s|10)
+exten => sw-10-BUSY,10,Voicemail(b${ext})
+exten => sw-10-BUSY,11,Goto(s|10)
+exten => sw-10-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-10-DONTCALL,11,Goto(s|10)
+exten => sw-10-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-10-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_9]
@@ -236,20 +236,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-11-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-11-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_9-11)
 exten => s,11,Return()
-exten => _sw-11-.,1,Voicemail(u${ext})
-exten => _sw-11-.,2,Goto(s|10)
-exten => sw-11-NOANSWER,1,Voicemail(u${ext})
-exten => sw-11-NOANSWER,2,Goto(s|10)
-exten => sw-11-ANSWER,1,Goto(s|10)
-exten => sw-11-BUSY,1,Voicemail(b${ext})
-exten => sw-11-BUSY,2,Goto(s|10)
-exten => sw-11-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-11-DONTCALL,2,Goto(s|10)
-exten => sw-11-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-11-TORTURE,2,Goto(s|10)
+exten => _sw-11-.,10,Voicemail(u${ext})
+exten => _sw-11-.,11,Goto(s|10)
+exten => sw-11-NOANSWER,10,Voicemail(u${ext})
+exten => sw-11-NOANSWER,11,Goto(s|10)
+exten => sw-11-ANSWER,10,Goto(s|10)
+exten => sw-11-BUSY,10,Voicemail(b${ext})
+exten => sw-11-BUSY,11,Goto(s|10)
+exten => sw-11-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-11-DONTCALL,11,Goto(s|10)
+exten => sw-11-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-11-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_10]
@@ -261,20 +261,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-12-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-12-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_10-12)
 exten => s,11,Return()
-exten => _sw-12-.,1,Voicemail(u${ext})
-exten => _sw-12-.,2,Goto(s|10)
-exten => sw-12-NOANSWER,1,Voicemail(u${ext})
-exten => sw-12-NOANSWER,2,Goto(s|10)
-exten => sw-12-ANSWER,1,Goto(s|10)
-exten => sw-12-BUSY,1,Voicemail(b${ext})
-exten => sw-12-BUSY,2,Goto(s|10)
-exten => sw-12-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-12-DONTCALL,2,Goto(s|10)
-exten => sw-12-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-12-TORTURE,2,Goto(s|10)
+exten => _sw-12-.,10,Voicemail(u${ext})
+exten => _sw-12-.,11,Goto(s|10)
+exten => sw-12-NOANSWER,10,Voicemail(u${ext})
+exten => sw-12-NOANSWER,11,Goto(s|10)
+exten => sw-12-ANSWER,10,Goto(s|10)
+exten => sw-12-BUSY,10,Voicemail(b${ext})
+exten => sw-12-BUSY,11,Goto(s|10)
+exten => sw-12-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-12-DONTCALL,11,Goto(s|10)
+exten => sw-12-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-12-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_11]
@@ -286,20 +286,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-13-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-13-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_11-13)
 exten => s,11,Return()
-exten => _sw-13-.,1,Voicemail(u${ext})
-exten => _sw-13-.,2,Goto(s|10)
-exten => sw-13-NOANSWER,1,Voicemail(u${ext})
-exten => sw-13-NOANSWER,2,Goto(s|10)
-exten => sw-13-ANSWER,1,Goto(s|10)
-exten => sw-13-BUSY,1,Voicemail(b${ext})
-exten => sw-13-BUSY,2,Goto(s|10)
-exten => sw-13-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-13-DONTCALL,2,Goto(s|10)
-exten => sw-13-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-13-TORTURE,2,Goto(s|10)
+exten => _sw-13-.,10,Voicemail(u${ext})
+exten => _sw-13-.,11,Goto(s|10)
+exten => sw-13-NOANSWER,10,Voicemail(u${ext})
+exten => sw-13-NOANSWER,11,Goto(s|10)
+exten => sw-13-ANSWER,10,Goto(s|10)
+exten => sw-13-BUSY,10,Voicemail(b${ext})
+exten => sw-13-BUSY,11,Goto(s|10)
+exten => sw-13-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-13-DONTCALL,11,Goto(s|10)
+exten => sw-13-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-13-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_12]
@@ -311,20 +311,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-14-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-14-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_12-14)
 exten => s,11,Return()
-exten => _sw-14-.,1,Voicemail(u${ext})
-exten => _sw-14-.,2,Goto(s|10)
-exten => sw-14-NOANSWER,1,Voicemail(u${ext})
-exten => sw-14-NOANSWER,2,Goto(s|10)
-exten => sw-14-ANSWER,1,Goto(s|10)
-exten => sw-14-BUSY,1,Voicemail(b${ext})
-exten => sw-14-BUSY,2,Goto(s|10)
-exten => sw-14-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-14-DONTCALL,2,Goto(s|10)
-exten => sw-14-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-14-TORTURE,2,Goto(s|10)
+exten => _sw-14-.,10,Voicemail(u${ext})
+exten => _sw-14-.,11,Goto(s|10)
+exten => sw-14-NOANSWER,10,Voicemail(u${ext})
+exten => sw-14-NOANSWER,11,Goto(s|10)
+exten => sw-14-ANSWER,10,Goto(s|10)
+exten => sw-14-BUSY,10,Voicemail(b${ext})
+exten => sw-14-BUSY,11,Goto(s|10)
+exten => sw-14-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-14-DONTCALL,11,Goto(s|10)
+exten => sw-14-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-14-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_13]
@@ -336,20 +336,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-15-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-15-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_13-15)
 exten => s,11,Return()
-exten => _sw-15-.,1,Voicemail(u${ext})
-exten => _sw-15-.,2,Goto(s|10)
-exten => sw-15-NOANSWER,1,Voicemail(u${ext})
-exten => sw-15-NOANSWER,2,Goto(s|10)
-exten => sw-15-ANSWER,1,Goto(s|10)
-exten => sw-15-BUSY,1,Voicemail(b${ext})
-exten => sw-15-BUSY,2,Goto(s|10)
-exten => sw-15-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-15-DONTCALL,2,Goto(s|10)
-exten => sw-15-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-15-TORTURE,2,Goto(s|10)
+exten => _sw-15-.,10,Voicemail(u${ext})
+exten => _sw-15-.,11,Goto(s|10)
+exten => sw-15-NOANSWER,10,Voicemail(u${ext})
+exten => sw-15-NOANSWER,11,Goto(s|10)
+exten => sw-15-ANSWER,10,Goto(s|10)
+exten => sw-15-BUSY,10,Voicemail(b${ext})
+exten => sw-15-BUSY,11,Goto(s|10)
+exten => sw-15-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-15-DONTCALL,11,Goto(s|10)
+exten => sw-15-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-15-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_14]
@@ -361,20 +361,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-16-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-16-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_14-16)
 exten => s,11,Return()
-exten => _sw-16-.,1,Voicemail(u${ext})
-exten => _sw-16-.,2,Goto(s|10)
-exten => sw-16-NOANSWER,1,Voicemail(u${ext})
-exten => sw-16-NOANSWER,2,Goto(s|10)
-exten => sw-16-ANSWER,1,Goto(s|10)
-exten => sw-16-BUSY,1,Voicemail(b${ext})
-exten => sw-16-BUSY,2,Goto(s|10)
-exten => sw-16-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-16-DONTCALL,2,Goto(s|10)
-exten => sw-16-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-16-TORTURE,2,Goto(s|10)
+exten => _sw-16-.,10,Voicemail(u${ext})
+exten => _sw-16-.,11,Goto(s|10)
+exten => sw-16-NOANSWER,10,Voicemail(u${ext})
+exten => sw-16-NOANSWER,11,Goto(s|10)
+exten => sw-16-ANSWER,10,Goto(s|10)
+exten => sw-16-BUSY,10,Voicemail(b${ext})
+exten => sw-16-BUSY,11,Goto(s|10)
+exten => sw-16-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-16-DONTCALL,11,Goto(s|10)
+exten => sw-16-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-16-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_15]
@@ -386,20 +386,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-17-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-17-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_15-17)
 exten => s,11,Return()
-exten => _sw-17-.,1,Voicemail(u${ext})
-exten => _sw-17-.,2,Goto(s|10)
-exten => sw-17-NOANSWER,1,Voicemail(u${ext})
-exten => sw-17-NOANSWER,2,Goto(s|10)
-exten => sw-17-ANSWER,1,Goto(s|10)
-exten => sw-17-BUSY,1,Voicemail(b${ext})
-exten => sw-17-BUSY,2,Goto(s|10)
-exten => sw-17-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-17-DONTCALL,2,Goto(s|10)
-exten => sw-17-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-17-TORTURE,2,Goto(s|10)
+exten => _sw-17-.,10,Voicemail(u${ext})
+exten => _sw-17-.,11,Goto(s|10)
+exten => sw-17-NOANSWER,10,Voicemail(u${ext})
+exten => sw-17-NOANSWER,11,Goto(s|10)
+exten => sw-17-ANSWER,10,Goto(s|10)
+exten => sw-17-BUSY,10,Voicemail(b${ext})
+exten => sw-17-BUSY,11,Goto(s|10)
+exten => sw-17-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-17-DONTCALL,11,Goto(s|10)
+exten => sw-17-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-17-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_16]
@@ -411,20 +411,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-18-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-18-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_16-18)
 exten => s,11,Return()
-exten => _sw-18-.,1,Voicemail(u${ext})
-exten => _sw-18-.,2,Goto(s|10)
-exten => sw-18-NOANSWER,1,Voicemail(u${ext})
-exten => sw-18-NOANSWER,2,Goto(s|10)
-exten => sw-18-ANSWER,1,Goto(s|10)
-exten => sw-18-BUSY,1,Voicemail(b${ext})
-exten => sw-18-BUSY,2,Goto(s|10)
-exten => sw-18-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-18-DONTCALL,2,Goto(s|10)
-exten => sw-18-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-18-TORTURE,2,Goto(s|10)
+exten => _sw-18-.,10,Voicemail(u${ext})
+exten => _sw-18-.,11,Goto(s|10)
+exten => sw-18-NOANSWER,10,Voicemail(u${ext})
+exten => sw-18-NOANSWER,11,Goto(s|10)
+exten => sw-18-ANSWER,10,Goto(s|10)
+exten => sw-18-BUSY,10,Voicemail(b${ext})
+exten => sw-18-BUSY,11,Goto(s|10)
+exten => sw-18-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-18-DONTCALL,11,Goto(s|10)
+exten => sw-18-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-18-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_17]
@@ -436,20 +436,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-19-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-19-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_17-19)
 exten => s,11,Return()
-exten => _sw-19-.,1,Voicemail(u${ext})
-exten => _sw-19-.,2,Goto(s|10)
-exten => sw-19-NOANSWER,1,Voicemail(u${ext})
-exten => sw-19-NOANSWER,2,Goto(s|10)
-exten => sw-19-ANSWER,1,Goto(s|10)
-exten => sw-19-BUSY,1,Voicemail(b${ext})
-exten => sw-19-BUSY,2,Goto(s|10)
-exten => sw-19-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-19-DONTCALL,2,Goto(s|10)
-exten => sw-19-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-19-TORTURE,2,Goto(s|10)
+exten => _sw-19-.,10,Voicemail(u${ext})
+exten => _sw-19-.,11,Goto(s|10)
+exten => sw-19-NOANSWER,10,Voicemail(u${ext})
+exten => sw-19-NOANSWER,11,Goto(s|10)
+exten => sw-19-ANSWER,10,Goto(s|10)
+exten => sw-19-BUSY,10,Voicemail(b${ext})
+exten => sw-19-BUSY,11,Goto(s|10)
+exten => sw-19-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-19-DONTCALL,11,Goto(s|10)
+exten => sw-19-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-19-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_18]
@@ -461,20 +461,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-20-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-20-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_18-20)
 exten => s,11,Return()
-exten => _sw-20-.,1,Voicemail(u${ext})
-exten => _sw-20-.,2,Goto(s|10)
-exten => sw-20-NOANSWER,1,Voicemail(u${ext})
-exten => sw-20-NOANSWER,2,Goto(s|10)
-exten => sw-20-ANSWER,1,Goto(s|10)
-exten => sw-20-BUSY,1,Voicemail(b${ext})
-exten => sw-20-BUSY,2,Goto(s|10)
-exten => sw-20-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-20-DONTCALL,2,Goto(s|10)
-exten => sw-20-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-20-TORTURE,2,Goto(s|10)
+exten => _sw-20-.,10,Voicemail(u${ext})
+exten => _sw-20-.,11,Goto(s|10)
+exten => sw-20-NOANSWER,10,Voicemail(u${ext})
+exten => sw-20-NOANSWER,11,Goto(s|10)
+exten => sw-20-ANSWER,10,Goto(s|10)
+exten => sw-20-BUSY,10,Voicemail(b${ext})
+exten => sw-20-BUSY,11,Goto(s|10)
+exten => sw-20-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-20-DONTCALL,11,Goto(s|10)
+exten => sw-20-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-20-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_19]
@@ -486,20 +486,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-21-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-21-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_19-21)
 exten => s,11,Return()
-exten => _sw-21-.,1,Voicemail(u${ext})
-exten => _sw-21-.,2,Goto(s|10)
-exten => sw-21-NOANSWER,1,Voicemail(u${ext})
-exten => sw-21-NOANSWER,2,Goto(s|10)
-exten => sw-21-ANSWER,1,Goto(s|10)
-exten => sw-21-BUSY,1,Voicemail(b${ext})
-exten => sw-21-BUSY,2,Goto(s|10)
-exten => sw-21-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-21-DONTCALL,2,Goto(s|10)
-exten => sw-21-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-21-TORTURE,2,Goto(s|10)
+exten => _sw-21-.,10,Voicemail(u${ext})
+exten => _sw-21-.,11,Goto(s|10)
+exten => sw-21-NOANSWER,10,Voicemail(u${ext})
+exten => sw-21-NOANSWER,11,Goto(s|10)
+exten => sw-21-ANSWER,10,Goto(s|10)
+exten => sw-21-BUSY,10,Voicemail(b${ext})
+exten => sw-21-BUSY,11,Goto(s|10)
+exten => sw-21-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-21-DONTCALL,11,Goto(s|10)
+exten => sw-21-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-21-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_20]
@@ -511,20 +511,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-22-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-22-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_20-22)
 exten => s,11,Return()
-exten => _sw-22-.,1,Voicemail(u${ext})
-exten => _sw-22-.,2,Goto(s|10)
-exten => sw-22-NOANSWER,1,Voicemail(u${ext})
-exten => sw-22-NOANSWER,2,Goto(s|10)
-exten => sw-22-ANSWER,1,Goto(s|10)
-exten => sw-22-BUSY,1,Voicemail(b${ext})
-exten => sw-22-BUSY,2,Goto(s|10)
-exten => sw-22-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-22-DONTCALL,2,Goto(s|10)
-exten => sw-22-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-22-TORTURE,2,Goto(s|10)
+exten => _sw-22-.,10,Voicemail(u${ext})
+exten => _sw-22-.,11,Goto(s|10)
+exten => sw-22-NOANSWER,10,Voicemail(u${ext})
+exten => sw-22-NOANSWER,11,Goto(s|10)
+exten => sw-22-ANSWER,10,Goto(s|10)
+exten => sw-22-BUSY,10,Voicemail(b${ext})
+exten => sw-22-BUSY,11,Goto(s|10)
+exten => sw-22-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-22-DONTCALL,11,Goto(s|10)
+exten => sw-22-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-22-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_21]
@@ -536,20 +536,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-23-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-23-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_21-23)
 exten => s,11,Return()
-exten => _sw-23-.,1,Voicemail(u${ext})
-exten => _sw-23-.,2,Goto(s|10)
-exten => sw-23-NOANSWER,1,Voicemail(u${ext})
-exten => sw-23-NOANSWER,2,Goto(s|10)
-exten => sw-23-ANSWER,1,Goto(s|10)
-exten => sw-23-BUSY,1,Voicemail(b${ext})
-exten => sw-23-BUSY,2,Goto(s|10)
-exten => sw-23-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-23-DONTCALL,2,Goto(s|10)
-exten => sw-23-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-23-TORTURE,2,Goto(s|10)
+exten => _sw-23-.,10,Voicemail(u${ext})
+exten => _sw-23-.,11,Goto(s|10)
+exten => sw-23-NOANSWER,10,Voicemail(u${ext})
+exten => sw-23-NOANSWER,11,Goto(s|10)
+exten => sw-23-ANSWER,10,Goto(s|10)
+exten => sw-23-BUSY,10,Voicemail(b${ext})
+exten => sw-23-BUSY,11,Goto(s|10)
+exten => sw-23-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-23-DONTCALL,11,Goto(s|10)
+exten => sw-23-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-23-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_22]
@@ -561,20 +561,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-24-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-24-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_22-24)
 exten => s,11,Return()
-exten => _sw-24-.,1,Voicemail(u${ext})
-exten => _sw-24-.,2,Goto(s|10)
-exten => sw-24-NOANSWER,1,Voicemail(u${ext})
-exten => sw-24-NOANSWER,2,Goto(s|10)
-exten => sw-24-ANSWER,1,Goto(s|10)
-exten => sw-24-BUSY,1,Voicemail(b${ext})
-exten => sw-24-BUSY,2,Goto(s|10)
-exten => sw-24-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-24-DONTCALL,2,Goto(s|10)
-exten => sw-24-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-24-TORTURE,2,Goto(s|10)
+exten => _sw-24-.,10,Voicemail(u${ext})
+exten => _sw-24-.,11,Goto(s|10)
+exten => sw-24-NOANSWER,10,Voicemail(u${ext})
+exten => sw-24-NOANSWER,11,Goto(s|10)
+exten => sw-24-ANSWER,10,Goto(s|10)
+exten => sw-24-BUSY,10,Voicemail(b${ext})
+exten => sw-24-BUSY,11,Goto(s|10)
+exten => sw-24-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-24-DONTCALL,11,Goto(s|10)
+exten => sw-24-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-24-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_23]
@@ -586,20 +586,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-25-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-25-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_23-25)
 exten => s,11,Return()
-exten => _sw-25-.,1,Voicemail(u${ext})
-exten => _sw-25-.,2,Goto(s|10)
-exten => sw-25-NOANSWER,1,Voicemail(u${ext})
-exten => sw-25-NOANSWER,2,Goto(s|10)
-exten => sw-25-ANSWER,1,Goto(s|10)
-exten => sw-25-BUSY,1,Voicemail(b${ext})
-exten => sw-25-BUSY,2,Goto(s|10)
-exten => sw-25-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-25-DONTCALL,2,Goto(s|10)
-exten => sw-25-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-25-TORTURE,2,Goto(s|10)
+exten => _sw-25-.,10,Voicemail(u${ext})
+exten => _sw-25-.,11,Goto(s|10)
+exten => sw-25-NOANSWER,10,Voicemail(u${ext})
+exten => sw-25-NOANSWER,11,Goto(s|10)
+exten => sw-25-ANSWER,10,Goto(s|10)
+exten => sw-25-BUSY,10,Voicemail(b${ext})
+exten => sw-25-BUSY,11,Goto(s|10)
+exten => sw-25-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-25-DONTCALL,11,Goto(s|10)
+exten => sw-25-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-25-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_24]
@@ -611,20 +611,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-26-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-26-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_24-26)
 exten => s,11,Return()
-exten => _sw-26-.,1,Voicemail(u${ext})
-exten => _sw-26-.,2,Goto(s|10)
-exten => sw-26-NOANSWER,1,Voicemail(u${ext})
-exten => sw-26-NOANSWER,2,Goto(s|10)
-exten => sw-26-ANSWER,1,Goto(s|10)
-exten => sw-26-BUSY,1,Voicemail(b${ext})
-exten => sw-26-BUSY,2,Goto(s|10)
-exten => sw-26-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-26-DONTCALL,2,Goto(s|10)
-exten => sw-26-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-26-TORTURE,2,Goto(s|10)
+exten => _sw-26-.,10,Voicemail(u${ext})
+exten => _sw-26-.,11,Goto(s|10)
+exten => sw-26-NOANSWER,10,Voicemail(u${ext})
+exten => sw-26-NOANSWER,11,Goto(s|10)
+exten => sw-26-ANSWER,10,Goto(s|10)
+exten => sw-26-BUSY,10,Voicemail(b${ext})
+exten => sw-26-BUSY,11,Goto(s|10)
+exten => sw-26-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-26-DONTCALL,11,Goto(s|10)
+exten => sw-26-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-26-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_25]
@@ -636,20 +636,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-27-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-27-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_25-27)
 exten => s,11,Return()
-exten => _sw-27-.,1,Voicemail(u${ext})
-exten => _sw-27-.,2,Goto(s|10)
-exten => sw-27-NOANSWER,1,Voicemail(u${ext})
-exten => sw-27-NOANSWER,2,Goto(s|10)
-exten => sw-27-ANSWER,1,Goto(s|10)
-exten => sw-27-BUSY,1,Voicemail(b${ext})
-exten => sw-27-BUSY,2,Goto(s|10)
-exten => sw-27-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-27-DONTCALL,2,Goto(s|10)
-exten => sw-27-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-27-TORTURE,2,Goto(s|10)
+exten => _sw-27-.,10,Voicemail(u${ext})
+exten => _sw-27-.,11,Goto(s|10)
+exten => sw-27-NOANSWER,10,Voicemail(u${ext})
+exten => sw-27-NOANSWER,11,Goto(s|10)
+exten => sw-27-ANSWER,10,Goto(s|10)
+exten => sw-27-BUSY,10,Voicemail(b${ext})
+exten => sw-27-BUSY,11,Goto(s|10)
+exten => sw-27-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-27-DONTCALL,11,Goto(s|10)
+exten => sw-27-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-27-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_26]
@@ -661,20 +661,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-28-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-28-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_26-28)
 exten => s,11,Return()
-exten => _sw-28-.,1,Voicemail(u${ext})
-exten => _sw-28-.,2,Goto(s|10)
-exten => sw-28-NOANSWER,1,Voicemail(u${ext})
-exten => sw-28-NOANSWER,2,Goto(s|10)
-exten => sw-28-ANSWER,1,Goto(s|10)
-exten => sw-28-BUSY,1,Voicemail(b${ext})
-exten => sw-28-BUSY,2,Goto(s|10)
-exten => sw-28-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-28-DONTCALL,2,Goto(s|10)
-exten => sw-28-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-28-TORTURE,2,Goto(s|10)
+exten => _sw-28-.,10,Voicemail(u${ext})
+exten => _sw-28-.,11,Goto(s|10)
+exten => sw-28-NOANSWER,10,Voicemail(u${ext})
+exten => sw-28-NOANSWER,11,Goto(s|10)
+exten => sw-28-ANSWER,10,Goto(s|10)
+exten => sw-28-BUSY,10,Voicemail(b${ext})
+exten => sw-28-BUSY,11,Goto(s|10)
+exten => sw-28-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-28-DONTCALL,11,Goto(s|10)
+exten => sw-28-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-28-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_27]
@@ -686,20 +686,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-29-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-29-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_27-29)
 exten => s,11,Return()
-exten => _sw-29-.,1,Voicemail(u${ext})
-exten => _sw-29-.,2,Goto(s|10)
-exten => sw-29-NOANSWER,1,Voicemail(u${ext})
-exten => sw-29-NOANSWER,2,Goto(s|10)
-exten => sw-29-ANSWER,1,Goto(s|10)
-exten => sw-29-BUSY,1,Voicemail(b${ext})
-exten => sw-29-BUSY,2,Goto(s|10)
-exten => sw-29-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-29-DONTCALL,2,Goto(s|10)
-exten => sw-29-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-29-TORTURE,2,Goto(s|10)
+exten => _sw-29-.,10,Voicemail(u${ext})
+exten => _sw-29-.,11,Goto(s|10)
+exten => sw-29-NOANSWER,10,Voicemail(u${ext})
+exten => sw-29-NOANSWER,11,Goto(s|10)
+exten => sw-29-ANSWER,10,Goto(s|10)
+exten => sw-29-BUSY,10,Voicemail(b${ext})
+exten => sw-29-BUSY,11,Goto(s|10)
+exten => sw-29-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-29-DONTCALL,11,Goto(s|10)
+exten => sw-29-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-29-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_28]
@@ -711,20 +711,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-30-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-30-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_28-30)
 exten => s,11,Return()
-exten => _sw-30-.,1,Voicemail(u${ext})
-exten => _sw-30-.,2,Goto(s|10)
-exten => sw-30-NOANSWER,1,Voicemail(u${ext})
-exten => sw-30-NOANSWER,2,Goto(s|10)
-exten => sw-30-ANSWER,1,Goto(s|10)
-exten => sw-30-BUSY,1,Voicemail(b${ext})
-exten => sw-30-BUSY,2,Goto(s|10)
-exten => sw-30-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-30-DONTCALL,2,Goto(s|10)
-exten => sw-30-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-30-TORTURE,2,Goto(s|10)
+exten => _sw-30-.,10,Voicemail(u${ext})
+exten => _sw-30-.,11,Goto(s|10)
+exten => sw-30-NOANSWER,10,Voicemail(u${ext})
+exten => sw-30-NOANSWER,11,Goto(s|10)
+exten => sw-30-ANSWER,10,Goto(s|10)
+exten => sw-30-BUSY,10,Voicemail(b${ext})
+exten => sw-30-BUSY,11,Goto(s|10)
+exten => sw-30-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-30-DONTCALL,11,Goto(s|10)
+exten => sw-30-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-30-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_29]
@@ -736,20 +736,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-31-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-31-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_29-31)
 exten => s,11,Return()
-exten => _sw-31-.,1,Voicemail(u${ext})
-exten => _sw-31-.,2,Goto(s|10)
-exten => sw-31-NOANSWER,1,Voicemail(u${ext})
-exten => sw-31-NOANSWER,2,Goto(s|10)
-exten => sw-31-ANSWER,1,Goto(s|10)
-exten => sw-31-BUSY,1,Voicemail(b${ext})
-exten => sw-31-BUSY,2,Goto(s|10)
-exten => sw-31-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-31-DONTCALL,2,Goto(s|10)
-exten => sw-31-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-31-TORTURE,2,Goto(s|10)
+exten => _sw-31-.,10,Voicemail(u${ext})
+exten => _sw-31-.,11,Goto(s|10)
+exten => sw-31-NOANSWER,10,Voicemail(u${ext})
+exten => sw-31-NOANSWER,11,Goto(s|10)
+exten => sw-31-ANSWER,10,Goto(s|10)
+exten => sw-31-BUSY,10,Voicemail(b${ext})
+exten => sw-31-BUSY,11,Goto(s|10)
+exten => sw-31-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-31-DONTCALL,11,Goto(s|10)
+exten => sw-31-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-31-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_30]
@@ -761,20 +761,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-32-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-32-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_30-32)
 exten => s,11,Return()
-exten => _sw-32-.,1,Voicemail(u${ext})
-exten => _sw-32-.,2,Goto(s|10)
-exten => sw-32-NOANSWER,1,Voicemail(u${ext})
-exten => sw-32-NOANSWER,2,Goto(s|10)
-exten => sw-32-ANSWER,1,Goto(s|10)
-exten => sw-32-BUSY,1,Voicemail(b${ext})
-exten => sw-32-BUSY,2,Goto(s|10)
-exten => sw-32-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-32-DONTCALL,2,Goto(s|10)
-exten => sw-32-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-32-TORTURE,2,Goto(s|10)
+exten => _sw-32-.,10,Voicemail(u${ext})
+exten => _sw-32-.,11,Goto(s|10)
+exten => sw-32-NOANSWER,10,Voicemail(u${ext})
+exten => sw-32-NOANSWER,11,Goto(s|10)
+exten => sw-32-ANSWER,10,Goto(s|10)
+exten => sw-32-BUSY,10,Voicemail(b${ext})
+exten => sw-32-BUSY,11,Goto(s|10)
+exten => sw-32-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-32-DONTCALL,11,Goto(s|10)
+exten => sw-32-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-32-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_31]
@@ -786,20 +786,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-33-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-33-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_31-33)
 exten => s,11,Return()
-exten => _sw-33-.,1,Voicemail(u${ext})
-exten => _sw-33-.,2,Goto(s|10)
-exten => sw-33-NOANSWER,1,Voicemail(u${ext})
-exten => sw-33-NOANSWER,2,Goto(s|10)
-exten => sw-33-ANSWER,1,Goto(s|10)
-exten => sw-33-BUSY,1,Voicemail(b${ext})
-exten => sw-33-BUSY,2,Goto(s|10)
-exten => sw-33-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-33-DONTCALL,2,Goto(s|10)
-exten => sw-33-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-33-TORTURE,2,Goto(s|10)
+exten => _sw-33-.,10,Voicemail(u${ext})
+exten => _sw-33-.,11,Goto(s|10)
+exten => sw-33-NOANSWER,10,Voicemail(u${ext})
+exten => sw-33-NOANSWER,11,Goto(s|10)
+exten => sw-33-ANSWER,10,Goto(s|10)
+exten => sw-33-BUSY,10,Voicemail(b${ext})
+exten => sw-33-BUSY,11,Goto(s|10)
+exten => sw-33-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-33-DONTCALL,11,Goto(s|10)
+exten => sw-33-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-33-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_32]
@@ -811,20 +811,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-34-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-34-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_32-34)
 exten => s,11,Return()
-exten => _sw-34-.,1,Voicemail(u${ext})
-exten => _sw-34-.,2,Goto(s|10)
-exten => sw-34-NOANSWER,1,Voicemail(u${ext})
-exten => sw-34-NOANSWER,2,Goto(s|10)
-exten => sw-34-ANSWER,1,Goto(s|10)
-exten => sw-34-BUSY,1,Voicemail(b${ext})
-exten => sw-34-BUSY,2,Goto(s|10)
-exten => sw-34-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-34-DONTCALL,2,Goto(s|10)
-exten => sw-34-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-34-TORTURE,2,Goto(s|10)
+exten => _sw-34-.,10,Voicemail(u${ext})
+exten => _sw-34-.,11,Goto(s|10)
+exten => sw-34-NOANSWER,10,Voicemail(u${ext})
+exten => sw-34-NOANSWER,11,Goto(s|10)
+exten => sw-34-ANSWER,10,Goto(s|10)
+exten => sw-34-BUSY,10,Voicemail(b${ext})
+exten => sw-34-BUSY,11,Goto(s|10)
+exten => sw-34-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-34-DONTCALL,11,Goto(s|10)
+exten => sw-34-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-34-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_33]
@@ -836,20 +836,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-35-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-35-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_33-35)
 exten => s,11,Return()
-exten => _sw-35-.,1,Voicemail(u${ext})
-exten => _sw-35-.,2,Goto(s|10)
-exten => sw-35-NOANSWER,1,Voicemail(u${ext})
-exten => sw-35-NOANSWER,2,Goto(s|10)
-exten => sw-35-ANSWER,1,Goto(s|10)
-exten => sw-35-BUSY,1,Voicemail(b${ext})
-exten => sw-35-BUSY,2,Goto(s|10)
-exten => sw-35-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-35-DONTCALL,2,Goto(s|10)
-exten => sw-35-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-35-TORTURE,2,Goto(s|10)
+exten => _sw-35-.,10,Voicemail(u${ext})
+exten => _sw-35-.,11,Goto(s|10)
+exten => sw-35-NOANSWER,10,Voicemail(u${ext})
+exten => sw-35-NOANSWER,11,Goto(s|10)
+exten => sw-35-ANSWER,10,Goto(s|10)
+exten => sw-35-BUSY,10,Voicemail(b${ext})
+exten => sw-35-BUSY,11,Goto(s|10)
+exten => sw-35-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-35-DONTCALL,11,Goto(s|10)
+exten => sw-35-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-35-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_34]
@@ -861,20 +861,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-36-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-36-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_34-36)
 exten => s,11,Return()
-exten => _sw-36-.,1,Voicemail(u${ext})
-exten => _sw-36-.,2,Goto(s|10)
-exten => sw-36-NOANSWER,1,Voicemail(u${ext})
-exten => sw-36-NOANSWER,2,Goto(s|10)
-exten => sw-36-ANSWER,1,Goto(s|10)
-exten => sw-36-BUSY,1,Voicemail(b${ext})
-exten => sw-36-BUSY,2,Goto(s|10)
-exten => sw-36-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-36-DONTCALL,2,Goto(s|10)
-exten => sw-36-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-36-TORTURE,2,Goto(s|10)
+exten => _sw-36-.,10,Voicemail(u${ext})
+exten => _sw-36-.,11,Goto(s|10)
+exten => sw-36-NOANSWER,10,Voicemail(u${ext})
+exten => sw-36-NOANSWER,11,Goto(s|10)
+exten => sw-36-ANSWER,10,Goto(s|10)
+exten => sw-36-BUSY,10,Voicemail(b${ext})
+exten => sw-36-BUSY,11,Goto(s|10)
+exten => sw-36-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-36-DONTCALL,11,Goto(s|10)
+exten => sw-36-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-36-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_35]
@@ -886,20 +886,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-37-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-37-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_35-37)
 exten => s,11,Return()
-exten => _sw-37-.,1,Voicemail(u${ext})
-exten => _sw-37-.,2,Goto(s|10)
-exten => sw-37-NOANSWER,1,Voicemail(u${ext})
-exten => sw-37-NOANSWER,2,Goto(s|10)
-exten => sw-37-ANSWER,1,Goto(s|10)
-exten => sw-37-BUSY,1,Voicemail(b${ext})
-exten => sw-37-BUSY,2,Goto(s|10)
-exten => sw-37-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-37-DONTCALL,2,Goto(s|10)
-exten => sw-37-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-37-TORTURE,2,Goto(s|10)
+exten => _sw-37-.,10,Voicemail(u${ext})
+exten => _sw-37-.,11,Goto(s|10)
+exten => sw-37-NOANSWER,10,Voicemail(u${ext})
+exten => sw-37-NOANSWER,11,Goto(s|10)
+exten => sw-37-ANSWER,10,Goto(s|10)
+exten => sw-37-BUSY,10,Voicemail(b${ext})
+exten => sw-37-BUSY,11,Goto(s|10)
+exten => sw-37-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-37-DONTCALL,11,Goto(s|10)
+exten => sw-37-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-37-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_36]
@@ -911,20 +911,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-38-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-38-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_36-38)
 exten => s,11,Return()
-exten => _sw-38-.,1,Voicemail(u${ext})
-exten => _sw-38-.,2,Goto(s|10)
-exten => sw-38-NOANSWER,1,Voicemail(u${ext})
-exten => sw-38-NOANSWER,2,Goto(s|10)
-exten => sw-38-ANSWER,1,Goto(s|10)
-exten => sw-38-BUSY,1,Voicemail(b${ext})
-exten => sw-38-BUSY,2,Goto(s|10)
-exten => sw-38-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-38-DONTCALL,2,Goto(s|10)
-exten => sw-38-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-38-TORTURE,2,Goto(s|10)
+exten => _sw-38-.,10,Voicemail(u${ext})
+exten => _sw-38-.,11,Goto(s|10)
+exten => sw-38-NOANSWER,10,Voicemail(u${ext})
+exten => sw-38-NOANSWER,11,Goto(s|10)
+exten => sw-38-ANSWER,10,Goto(s|10)
+exten => sw-38-BUSY,10,Voicemail(b${ext})
+exten => sw-38-BUSY,11,Goto(s|10)
+exten => sw-38-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-38-DONTCALL,11,Goto(s|10)
+exten => sw-38-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-38-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_37]
@@ -936,20 +936,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-39-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-39-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_37-39)
 exten => s,11,Return()
-exten => _sw-39-.,1,Voicemail(u${ext})
-exten => _sw-39-.,2,Goto(s|10)
-exten => sw-39-NOANSWER,1,Voicemail(u${ext})
-exten => sw-39-NOANSWER,2,Goto(s|10)
-exten => sw-39-ANSWER,1,Goto(s|10)
-exten => sw-39-BUSY,1,Voicemail(b${ext})
-exten => sw-39-BUSY,2,Goto(s|10)
-exten => sw-39-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-39-DONTCALL,2,Goto(s|10)
-exten => sw-39-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-39-TORTURE,2,Goto(s|10)
+exten => _sw-39-.,10,Voicemail(u${ext})
+exten => _sw-39-.,11,Goto(s|10)
+exten => sw-39-NOANSWER,10,Voicemail(u${ext})
+exten => sw-39-NOANSWER,11,Goto(s|10)
+exten => sw-39-ANSWER,10,Goto(s|10)
+exten => sw-39-BUSY,10,Voicemail(b${ext})
+exten => sw-39-BUSY,11,Goto(s|10)
+exten => sw-39-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-39-DONTCALL,11,Goto(s|10)
+exten => sw-39-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-39-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_38]
@@ -961,20 +961,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-40-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-40-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_38-40)
 exten => s,11,Return()
-exten => _sw-40-.,1,Voicemail(u${ext})
-exten => _sw-40-.,2,Goto(s|10)
-exten => sw-40-NOANSWER,1,Voicemail(u${ext})
-exten => sw-40-NOANSWER,2,Goto(s|10)
-exten => sw-40-ANSWER,1,Goto(s|10)
-exten => sw-40-BUSY,1,Voicemail(b${ext})
-exten => sw-40-BUSY,2,Goto(s|10)
-exten => sw-40-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-40-DONTCALL,2,Goto(s|10)
-exten => sw-40-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-40-TORTURE,2,Goto(s|10)
+exten => _sw-40-.,10,Voicemail(u${ext})
+exten => _sw-40-.,11,Goto(s|10)
+exten => sw-40-NOANSWER,10,Voicemail(u${ext})
+exten => sw-40-NOANSWER,11,Goto(s|10)
+exten => sw-40-ANSWER,10,Goto(s|10)
+exten => sw-40-BUSY,10,Voicemail(b${ext})
+exten => sw-40-BUSY,11,Goto(s|10)
+exten => sw-40-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-40-DONTCALL,11,Goto(s|10)
+exten => sw-40-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-40-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_39]
@@ -986,20 +986,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-41-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-41-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_39-41)
 exten => s,11,Return()
-exten => _sw-41-.,1,Voicemail(u${ext})
-exten => _sw-41-.,2,Goto(s|10)
-exten => sw-41-NOANSWER,1,Voicemail(u${ext})
-exten => sw-41-NOANSWER,2,Goto(s|10)
-exten => sw-41-ANSWER,1,Goto(s|10)
-exten => sw-41-BUSY,1,Voicemail(b${ext})
-exten => sw-41-BUSY,2,Goto(s|10)
-exten => sw-41-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-41-DONTCALL,2,Goto(s|10)
-exten => sw-41-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-41-TORTURE,2,Goto(s|10)
+exten => _sw-41-.,10,Voicemail(u${ext})
+exten => _sw-41-.,11,Goto(s|10)
+exten => sw-41-NOANSWER,10,Voicemail(u${ext})
+exten => sw-41-NOANSWER,11,Goto(s|10)
+exten => sw-41-ANSWER,10,Goto(s|10)
+exten => sw-41-BUSY,10,Voicemail(b${ext})
+exten => sw-41-BUSY,11,Goto(s|10)
+exten => sw-41-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-41-DONTCALL,11,Goto(s|10)
+exten => sw-41-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-41-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_40]
@@ -1011,20 +1011,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-42-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-42-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_40-42)
 exten => s,11,Return()
-exten => _sw-42-.,1,Voicemail(u${ext})
-exten => _sw-42-.,2,Goto(s|10)
-exten => sw-42-NOANSWER,1,Voicemail(u${ext})
-exten => sw-42-NOANSWER,2,Goto(s|10)
-exten => sw-42-ANSWER,1,Goto(s|10)
-exten => sw-42-BUSY,1,Voicemail(b${ext})
-exten => sw-42-BUSY,2,Goto(s|10)
-exten => sw-42-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-42-DONTCALL,2,Goto(s|10)
-exten => sw-42-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-42-TORTURE,2,Goto(s|10)
+exten => _sw-42-.,10,Voicemail(u${ext})
+exten => _sw-42-.,11,Goto(s|10)
+exten => sw-42-NOANSWER,10,Voicemail(u${ext})
+exten => sw-42-NOANSWER,11,Goto(s|10)
+exten => sw-42-ANSWER,10,Goto(s|10)
+exten => sw-42-BUSY,10,Voicemail(b${ext})
+exten => sw-42-BUSY,11,Goto(s|10)
+exten => sw-42-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-42-DONTCALL,11,Goto(s|10)
+exten => sw-42-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-42-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_41]
@@ -1036,20 +1036,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-43-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-43-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_41-43)
 exten => s,11,Return()
-exten => _sw-43-.,1,Voicemail(u${ext})
-exten => _sw-43-.,2,Goto(s|10)
-exten => sw-43-NOANSWER,1,Voicemail(u${ext})
-exten => sw-43-NOANSWER,2,Goto(s|10)
-exten => sw-43-ANSWER,1,Goto(s|10)
-exten => sw-43-BUSY,1,Voicemail(b${ext})
-exten => sw-43-BUSY,2,Goto(s|10)
-exten => sw-43-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-43-DONTCALL,2,Goto(s|10)
-exten => sw-43-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-43-TORTURE,2,Goto(s|10)
+exten => _sw-43-.,10,Voicemail(u${ext})
+exten => _sw-43-.,11,Goto(s|10)
+exten => sw-43-NOANSWER,10,Voicemail(u${ext})
+exten => sw-43-NOANSWER,11,Goto(s|10)
+exten => sw-43-ANSWER,10,Goto(s|10)
+exten => sw-43-BUSY,10,Voicemail(b${ext})
+exten => sw-43-BUSY,11,Goto(s|10)
+exten => sw-43-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-43-DONTCALL,11,Goto(s|10)
+exten => sw-43-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-43-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_42]
@@ -1061,20 +1061,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-44-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-44-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_42-44)
 exten => s,11,Return()
-exten => _sw-44-.,1,Voicemail(u${ext})
-exten => _sw-44-.,2,Goto(s|10)
-exten => sw-44-NOANSWER,1,Voicemail(u${ext})
-exten => sw-44-NOANSWER,2,Goto(s|10)
-exten => sw-44-ANSWER,1,Goto(s|10)
-exten => sw-44-BUSY,1,Voicemail(b${ext})
-exten => sw-44-BUSY,2,Goto(s|10)
-exten => sw-44-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-44-DONTCALL,2,Goto(s|10)
-exten => sw-44-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-44-TORTURE,2,Goto(s|10)
+exten => _sw-44-.,10,Voicemail(u${ext})
+exten => _sw-44-.,11,Goto(s|10)
+exten => sw-44-NOANSWER,10,Voicemail(u${ext})
+exten => sw-44-NOANSWER,11,Goto(s|10)
+exten => sw-44-ANSWER,10,Goto(s|10)
+exten => sw-44-BUSY,10,Voicemail(b${ext})
+exten => sw-44-BUSY,11,Goto(s|10)
+exten => sw-44-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-44-DONTCALL,11,Goto(s|10)
+exten => sw-44-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-44-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_43]
@@ -1086,20 +1086,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-45-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-45-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_43-45)
 exten => s,11,Return()
-exten => _sw-45-.,1,Voicemail(u${ext})
-exten => _sw-45-.,2,Goto(s|10)
-exten => sw-45-NOANSWER,1,Voicemail(u${ext})
-exten => sw-45-NOANSWER,2,Goto(s|10)
-exten => sw-45-ANSWER,1,Goto(s|10)
-exten => sw-45-BUSY,1,Voicemail(b${ext})
-exten => sw-45-BUSY,2,Goto(s|10)
-exten => sw-45-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-45-DONTCALL,2,Goto(s|10)
-exten => sw-45-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-45-TORTURE,2,Goto(s|10)
+exten => _sw-45-.,10,Voicemail(u${ext})
+exten => _sw-45-.,11,Goto(s|10)
+exten => sw-45-NOANSWER,10,Voicemail(u${ext})
+exten => sw-45-NOANSWER,11,Goto(s|10)
+exten => sw-45-ANSWER,10,Goto(s|10)
+exten => sw-45-BUSY,10,Voicemail(b${ext})
+exten => sw-45-BUSY,11,Goto(s|10)
+exten => sw-45-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-45-DONTCALL,11,Goto(s|10)
+exten => sw-45-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-45-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_44]
@@ -1111,20 +1111,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-46-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-46-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_44-46)
 exten => s,11,Return()
-exten => _sw-46-.,1,Voicemail(u${ext})
-exten => _sw-46-.,2,Goto(s|10)
-exten => sw-46-NOANSWER,1,Voicemail(u${ext})
-exten => sw-46-NOANSWER,2,Goto(s|10)
-exten => sw-46-ANSWER,1,Goto(s|10)
-exten => sw-46-BUSY,1,Voicemail(b${ext})
-exten => sw-46-BUSY,2,Goto(s|10)
-exten => sw-46-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-46-DONTCALL,2,Goto(s|10)
-exten => sw-46-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-46-TORTURE,2,Goto(s|10)
+exten => _sw-46-.,10,Voicemail(u${ext})
+exten => _sw-46-.,11,Goto(s|10)
+exten => sw-46-NOANSWER,10,Voicemail(u${ext})
+exten => sw-46-NOANSWER,11,Goto(s|10)
+exten => sw-46-ANSWER,10,Goto(s|10)
+exten => sw-46-BUSY,10,Voicemail(b${ext})
+exten => sw-46-BUSY,11,Goto(s|10)
+exten => sw-46-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-46-DONTCALL,11,Goto(s|10)
+exten => sw-46-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-46-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_45]
@@ -1136,20 +1136,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-47-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-47-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_45-47)
 exten => s,11,Return()
-exten => _sw-47-.,1,Voicemail(u${ext})
-exten => _sw-47-.,2,Goto(s|10)
-exten => sw-47-NOANSWER,1,Voicemail(u${ext})
-exten => sw-47-NOANSWER,2,Goto(s|10)
-exten => sw-47-ANSWER,1,Goto(s|10)
-exten => sw-47-BUSY,1,Voicemail(b${ext})
-exten => sw-47-BUSY,2,Goto(s|10)
-exten => sw-47-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-47-DONTCALL,2,Goto(s|10)
-exten => sw-47-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-47-TORTURE,2,Goto(s|10)
+exten => _sw-47-.,10,Voicemail(u${ext})
+exten => _sw-47-.,11,Goto(s|10)
+exten => sw-47-NOANSWER,10,Voicemail(u${ext})
+exten => sw-47-NOANSWER,11,Goto(s|10)
+exten => sw-47-ANSWER,10,Goto(s|10)
+exten => sw-47-BUSY,10,Voicemail(b${ext})
+exten => sw-47-BUSY,11,Goto(s|10)
+exten => sw-47-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-47-DONTCALL,11,Goto(s|10)
+exten => sw-47-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-47-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_46]
@@ -1161,20 +1161,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-48-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-48-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_46-48)
 exten => s,11,Return()
-exten => _sw-48-.,1,Voicemail(u${ext})
-exten => _sw-48-.,2,Goto(s|10)
-exten => sw-48-NOANSWER,1,Voicemail(u${ext})
-exten => sw-48-NOANSWER,2,Goto(s|10)
-exten => sw-48-ANSWER,1,Goto(s|10)
-exten => sw-48-BUSY,1,Voicemail(b${ext})
-exten => sw-48-BUSY,2,Goto(s|10)
-exten => sw-48-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-48-DONTCALL,2,Goto(s|10)
-exten => sw-48-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-48-TORTURE,2,Goto(s|10)
+exten => _sw-48-.,10,Voicemail(u${ext})
+exten => _sw-48-.,11,Goto(s|10)
+exten => sw-48-NOANSWER,10,Voicemail(u${ext})
+exten => sw-48-NOANSWER,11,Goto(s|10)
+exten => sw-48-ANSWER,10,Goto(s|10)
+exten => sw-48-BUSY,10,Voicemail(b${ext})
+exten => sw-48-BUSY,11,Goto(s|10)
+exten => sw-48-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-48-DONTCALL,11,Goto(s|10)
+exten => sw-48-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-48-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_47]
@@ -1186,20 +1186,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-49-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-49-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_47-49)
 exten => s,11,Return()
-exten => _sw-49-.,1,Voicemail(u${ext})
-exten => _sw-49-.,2,Goto(s|10)
-exten => sw-49-NOANSWER,1,Voicemail(u${ext})
-exten => sw-49-NOANSWER,2,Goto(s|10)
-exten => sw-49-ANSWER,1,Goto(s|10)
-exten => sw-49-BUSY,1,Voicemail(b${ext})
-exten => sw-49-BUSY,2,Goto(s|10)
-exten => sw-49-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-49-DONTCALL,2,Goto(s|10)
-exten => sw-49-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-49-TORTURE,2,Goto(s|10)
+exten => _sw-49-.,10,Voicemail(u${ext})
+exten => _sw-49-.,11,Goto(s|10)
+exten => sw-49-NOANSWER,10,Voicemail(u${ext})
+exten => sw-49-NOANSWER,11,Goto(s|10)
+exten => sw-49-ANSWER,10,Goto(s|10)
+exten => sw-49-BUSY,10,Voicemail(b${ext})
+exten => sw-49-BUSY,11,Goto(s|10)
+exten => sw-49-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-49-DONTCALL,11,Goto(s|10)
+exten => sw-49-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-49-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_48]
@@ -1211,20 +1211,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-50-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-50-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_48-50)
 exten => s,11,Return()
-exten => _sw-50-.,1,Voicemail(u${ext})
-exten => _sw-50-.,2,Goto(s|10)
-exten => sw-50-NOANSWER,1,Voicemail(u${ext})
-exten => sw-50-NOANSWER,2,Goto(s|10)
-exten => sw-50-ANSWER,1,Goto(s|10)
-exten => sw-50-BUSY,1,Voicemail(b${ext})
-exten => sw-50-BUSY,2,Goto(s|10)
-exten => sw-50-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-50-DONTCALL,2,Goto(s|10)
-exten => sw-50-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-50-TORTURE,2,Goto(s|10)
+exten => _sw-50-.,10,Voicemail(u${ext})
+exten => _sw-50-.,11,Goto(s|10)
+exten => sw-50-NOANSWER,10,Voicemail(u${ext})
+exten => sw-50-NOANSWER,11,Goto(s|10)
+exten => sw-50-ANSWER,10,Goto(s|10)
+exten => sw-50-BUSY,10,Voicemail(b${ext})
+exten => sw-50-BUSY,11,Goto(s|10)
+exten => sw-50-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-50-DONTCALL,11,Goto(s|10)
+exten => sw-50-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-50-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_49]
@@ -1236,20 +1236,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-51-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-51-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_49-51)
 exten => s,11,Return()
-exten => _sw-51-.,1,Voicemail(u${ext})
-exten => _sw-51-.,2,Goto(s|10)
-exten => sw-51-NOANSWER,1,Voicemail(u${ext})
-exten => sw-51-NOANSWER,2,Goto(s|10)
-exten => sw-51-ANSWER,1,Goto(s|10)
-exten => sw-51-BUSY,1,Voicemail(b${ext})
-exten => sw-51-BUSY,2,Goto(s|10)
-exten => sw-51-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-51-DONTCALL,2,Goto(s|10)
-exten => sw-51-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-51-TORTURE,2,Goto(s|10)
+exten => _sw-51-.,10,Voicemail(u${ext})
+exten => _sw-51-.,11,Goto(s|10)
+exten => sw-51-NOANSWER,10,Voicemail(u${ext})
+exten => sw-51-NOANSWER,11,Goto(s|10)
+exten => sw-51-ANSWER,10,Goto(s|10)
+exten => sw-51-BUSY,10,Voicemail(b${ext})
+exten => sw-51-BUSY,11,Goto(s|10)
+exten => sw-51-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-51-DONTCALL,11,Goto(s|10)
+exten => sw-51-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-51-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_50]
@@ -1261,20 +1261,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-52-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-52-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_50-52)
 exten => s,11,Return()
-exten => _sw-52-.,1,Voicemail(u${ext})
-exten => _sw-52-.,2,Goto(s|10)
-exten => sw-52-NOANSWER,1,Voicemail(u${ext})
-exten => sw-52-NOANSWER,2,Goto(s|10)
-exten => sw-52-ANSWER,1,Goto(s|10)
-exten => sw-52-BUSY,1,Voicemail(b${ext})
-exten => sw-52-BUSY,2,Goto(s|10)
-exten => sw-52-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-52-DONTCALL,2,Goto(s|10)
-exten => sw-52-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-52-TORTURE,2,Goto(s|10)
+exten => _sw-52-.,10,Voicemail(u${ext})
+exten => _sw-52-.,11,Goto(s|10)
+exten => sw-52-NOANSWER,10,Voicemail(u${ext})
+exten => sw-52-NOANSWER,11,Goto(s|10)
+exten => sw-52-ANSWER,10,Goto(s|10)
+exten => sw-52-BUSY,10,Voicemail(b${ext})
+exten => sw-52-BUSY,11,Goto(s|10)
+exten => sw-52-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-52-DONTCALL,11,Goto(s|10)
+exten => sw-52-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-52-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_51]
@@ -1286,20 +1286,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-53-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-53-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_51-53)
 exten => s,11,Return()
-exten => _sw-53-.,1,Voicemail(u${ext})
-exten => _sw-53-.,2,Goto(s|10)
-exten => sw-53-NOANSWER,1,Voicemail(u${ext})
-exten => sw-53-NOANSWER,2,Goto(s|10)
-exten => sw-53-ANSWER,1,Goto(s|10)
-exten => sw-53-BUSY,1,Voicemail(b${ext})
-exten => sw-53-BUSY,2,Goto(s|10)
-exten => sw-53-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-53-DONTCALL,2,Goto(s|10)
-exten => sw-53-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-53-TORTURE,2,Goto(s|10)
+exten => _sw-53-.,10,Voicemail(u${ext})
+exten => _sw-53-.,11,Goto(s|10)
+exten => sw-53-NOANSWER,10,Voicemail(u${ext})
+exten => sw-53-NOANSWER,11,Goto(s|10)
+exten => sw-53-ANSWER,10,Goto(s|10)
+exten => sw-53-BUSY,10,Voicemail(b${ext})
+exten => sw-53-BUSY,11,Goto(s|10)
+exten => sw-53-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-53-DONTCALL,11,Goto(s|10)
+exten => sw-53-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-53-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_52]
@@ -1311,20 +1311,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-54-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-54-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_52-54)
 exten => s,11,Return()
-exten => _sw-54-.,1,Voicemail(u${ext})
-exten => _sw-54-.,2,Goto(s|10)
-exten => sw-54-NOANSWER,1,Voicemail(u${ext})
-exten => sw-54-NOANSWER,2,Goto(s|10)
-exten => sw-54-ANSWER,1,Goto(s|10)
-exten => sw-54-BUSY,1,Voicemail(b${ext})
-exten => sw-54-BUSY,2,Goto(s|10)
-exten => sw-54-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-54-DONTCALL,2,Goto(s|10)
-exten => sw-54-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-54-TORTURE,2,Goto(s|10)
+exten => _sw-54-.,10,Voicemail(u${ext})
+exten => _sw-54-.,11,Goto(s|10)
+exten => sw-54-NOANSWER,10,Voicemail(u${ext})
+exten => sw-54-NOANSWER,11,Goto(s|10)
+exten => sw-54-ANSWER,10,Goto(s|10)
+exten => sw-54-BUSY,10,Voicemail(b${ext})
+exten => sw-54-BUSY,11,Goto(s|10)
+exten => sw-54-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-54-DONTCALL,11,Goto(s|10)
+exten => sw-54-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-54-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_53]
@@ -1336,20 +1336,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-55-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-55-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_53-55)
 exten => s,11,Return()
-exten => _sw-55-.,1,Voicemail(u${ext})
-exten => _sw-55-.,2,Goto(s|10)
-exten => sw-55-NOANSWER,1,Voicemail(u${ext})
-exten => sw-55-NOANSWER,2,Goto(s|10)
-exten => sw-55-ANSWER,1,Goto(s|10)
-exten => sw-55-BUSY,1,Voicemail(b${ext})
-exten => sw-55-BUSY,2,Goto(s|10)
-exten => sw-55-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-55-DONTCALL,2,Goto(s|10)
-exten => sw-55-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-55-TORTURE,2,Goto(s|10)
+exten => _sw-55-.,10,Voicemail(u${ext})
+exten => _sw-55-.,11,Goto(s|10)
+exten => sw-55-NOANSWER,10,Voicemail(u${ext})
+exten => sw-55-NOANSWER,11,Goto(s|10)
+exten => sw-55-ANSWER,10,Goto(s|10)
+exten => sw-55-BUSY,10,Voicemail(b${ext})
+exten => sw-55-BUSY,11,Goto(s|10)
+exten => sw-55-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-55-DONTCALL,11,Goto(s|10)
+exten => sw-55-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-55-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_54]
@@ -1361,20 +1361,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-56-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-56-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_54-56)
 exten => s,11,Return()
-exten => _sw-56-.,1,Voicemail(u${ext})
-exten => _sw-56-.,2,Goto(s|10)
-exten => sw-56-NOANSWER,1,Voicemail(u${ext})
-exten => sw-56-NOANSWER,2,Goto(s|10)
-exten => sw-56-ANSWER,1,Goto(s|10)
-exten => sw-56-BUSY,1,Voicemail(b${ext})
-exten => sw-56-BUSY,2,Goto(s|10)
-exten => sw-56-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-56-DONTCALL,2,Goto(s|10)
-exten => sw-56-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-56-TORTURE,2,Goto(s|10)
+exten => _sw-56-.,10,Voicemail(u${ext})
+exten => _sw-56-.,11,Goto(s|10)
+exten => sw-56-NOANSWER,10,Voicemail(u${ext})
+exten => sw-56-NOANSWER,11,Goto(s|10)
+exten => sw-56-ANSWER,10,Goto(s|10)
+exten => sw-56-BUSY,10,Voicemail(b${ext})
+exten => sw-56-BUSY,11,Goto(s|10)
+exten => sw-56-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-56-DONTCALL,11,Goto(s|10)
+exten => sw-56-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-56-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_55]
@@ -1386,20 +1386,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-57-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-57-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_55-57)
 exten => s,11,Return()
-exten => _sw-57-.,1,Voicemail(u${ext})
-exten => _sw-57-.,2,Goto(s|10)
-exten => sw-57-NOANSWER,1,Voicemail(u${ext})
-exten => sw-57-NOANSWER,2,Goto(s|10)
-exten => sw-57-ANSWER,1,Goto(s|10)
-exten => sw-57-BUSY,1,Voicemail(b${ext})
-exten => sw-57-BUSY,2,Goto(s|10)
-exten => sw-57-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-57-DONTCALL,2,Goto(s|10)
-exten => sw-57-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-57-TORTURE,2,Goto(s|10)
+exten => _sw-57-.,10,Voicemail(u${ext})
+exten => _sw-57-.,11,Goto(s|10)
+exten => sw-57-NOANSWER,10,Voicemail(u${ext})
+exten => sw-57-NOANSWER,11,Goto(s|10)
+exten => sw-57-ANSWER,10,Goto(s|10)
+exten => sw-57-BUSY,10,Voicemail(b${ext})
+exten => sw-57-BUSY,11,Goto(s|10)
+exten => sw-57-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-57-DONTCALL,11,Goto(s|10)
+exten => sw-57-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-57-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_56]
@@ -1411,20 +1411,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-58-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-58-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_56-58)
 exten => s,11,Return()
-exten => _sw-58-.,1,Voicemail(u${ext})
-exten => _sw-58-.,2,Goto(s|10)
-exten => sw-58-NOANSWER,1,Voicemail(u${ext})
-exten => sw-58-NOANSWER,2,Goto(s|10)
-exten => sw-58-ANSWER,1,Goto(s|10)
-exten => sw-58-BUSY,1,Voicemail(b${ext})
-exten => sw-58-BUSY,2,Goto(s|10)
-exten => sw-58-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-58-DONTCALL,2,Goto(s|10)
-exten => sw-58-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-58-TORTURE,2,Goto(s|10)
+exten => _sw-58-.,10,Voicemail(u${ext})
+exten => _sw-58-.,11,Goto(s|10)
+exten => sw-58-NOANSWER,10,Voicemail(u${ext})
+exten => sw-58-NOANSWER,11,Goto(s|10)
+exten => sw-58-ANSWER,10,Goto(s|10)
+exten => sw-58-BUSY,10,Voicemail(b${ext})
+exten => sw-58-BUSY,11,Goto(s|10)
+exten => sw-58-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-58-DONTCALL,11,Goto(s|10)
+exten => sw-58-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-58-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_57]
@@ -1436,20 +1436,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-59-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-59-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_57-59)
 exten => s,11,Return()
-exten => _sw-59-.,1,Voicemail(u${ext})
-exten => _sw-59-.,2,Goto(s|10)
-exten => sw-59-NOANSWER,1,Voicemail(u${ext})
-exten => sw-59-NOANSWER,2,Goto(s|10)
-exten => sw-59-ANSWER,1,Goto(s|10)
-exten => sw-59-BUSY,1,Voicemail(b${ext})
-exten => sw-59-BUSY,2,Goto(s|10)
-exten => sw-59-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-59-DONTCALL,2,Goto(s|10)
-exten => sw-59-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-59-TORTURE,2,Goto(s|10)
+exten => _sw-59-.,10,Voicemail(u${ext})
+exten => _sw-59-.,11,Goto(s|10)
+exten => sw-59-NOANSWER,10,Voicemail(u${ext})
+exten => sw-59-NOANSWER,11,Goto(s|10)
+exten => sw-59-ANSWER,10,Goto(s|10)
+exten => sw-59-BUSY,10,Voicemail(b${ext})
+exten => sw-59-BUSY,11,Goto(s|10)
+exten => sw-59-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-59-DONTCALL,11,Goto(s|10)
+exten => sw-59-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-59-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_58]
@@ -1461,20 +1461,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-60-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-60-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_58-60)
 exten => s,11,Return()
-exten => _sw-60-.,1,Voicemail(u${ext})
-exten => _sw-60-.,2,Goto(s|10)
-exten => sw-60-NOANSWER,1,Voicemail(u${ext})
-exten => sw-60-NOANSWER,2,Goto(s|10)
-exten => sw-60-ANSWER,1,Goto(s|10)
-exten => sw-60-BUSY,1,Voicemail(b${ext})
-exten => sw-60-BUSY,2,Goto(s|10)
-exten => sw-60-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-60-DONTCALL,2,Goto(s|10)
-exten => sw-60-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-60-TORTURE,2,Goto(s|10)
+exten => _sw-60-.,10,Voicemail(u${ext})
+exten => _sw-60-.,11,Goto(s|10)
+exten => sw-60-NOANSWER,10,Voicemail(u${ext})
+exten => sw-60-NOANSWER,11,Goto(s|10)
+exten => sw-60-ANSWER,10,Goto(s|10)
+exten => sw-60-BUSY,10,Voicemail(b${ext})
+exten => sw-60-BUSY,11,Goto(s|10)
+exten => sw-60-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-60-DONTCALL,11,Goto(s|10)
+exten => sw-60-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-60-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_59]
@@ -1486,20 +1486,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-61-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-61-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_59-61)
 exten => s,11,Return()
-exten => _sw-61-.,1,Voicemail(u${ext})
-exten => _sw-61-.,2,Goto(s|10)
-exten => sw-61-NOANSWER,1,Voicemail(u${ext})
-exten => sw-61-NOANSWER,2,Goto(s|10)
-exten => sw-61-ANSWER,1,Goto(s|10)
-exten => sw-61-BUSY,1,Voicemail(b${ext})
-exten => sw-61-BUSY,2,Goto(s|10)
-exten => sw-61-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-61-DONTCALL,2,Goto(s|10)
-exten => sw-61-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-61-TORTURE,2,Goto(s|10)
+exten => _sw-61-.,10,Voicemail(u${ext})
+exten => _sw-61-.,11,Goto(s|10)
+exten => sw-61-NOANSWER,10,Voicemail(u${ext})
+exten => sw-61-NOANSWER,11,Goto(s|10)
+exten => sw-61-ANSWER,10,Goto(s|10)
+exten => sw-61-BUSY,10,Voicemail(b${ext})
+exten => sw-61-BUSY,11,Goto(s|10)
+exten => sw-61-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-61-DONTCALL,11,Goto(s|10)
+exten => sw-61-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-61-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_60]
@@ -1511,20 +1511,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-62-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-62-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_60-62)
 exten => s,11,Return()
-exten => _sw-62-.,1,Voicemail(u${ext})
-exten => _sw-62-.,2,Goto(s|10)
-exten => sw-62-NOANSWER,1,Voicemail(u${ext})
-exten => sw-62-NOANSWER,2,Goto(s|10)
-exten => sw-62-ANSWER,1,Goto(s|10)
-exten => sw-62-BUSY,1,Voicemail(b${ext})
-exten => sw-62-BUSY,2,Goto(s|10)
-exten => sw-62-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-62-DONTCALL,2,Goto(s|10)
-exten => sw-62-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-62-TORTURE,2,Goto(s|10)
+exten => _sw-62-.,10,Voicemail(u${ext})
+exten => _sw-62-.,11,Goto(s|10)
+exten => sw-62-NOANSWER,10,Voicemail(u${ext})
+exten => sw-62-NOANSWER,11,Goto(s|10)
+exten => sw-62-ANSWER,10,Goto(s|10)
+exten => sw-62-BUSY,10,Voicemail(b${ext})
+exten => sw-62-BUSY,11,Goto(s|10)
+exten => sw-62-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-62-DONTCALL,11,Goto(s|10)
+exten => sw-62-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-62-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_61]
@@ -1536,20 +1536,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-63-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-63-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_61-63)
 exten => s,11,Return()
-exten => _sw-63-.,1,Voicemail(u${ext})
-exten => _sw-63-.,2,Goto(s|10)
-exten => sw-63-NOANSWER,1,Voicemail(u${ext})
-exten => sw-63-NOANSWER,2,Goto(s|10)
-exten => sw-63-ANSWER,1,Goto(s|10)
-exten => sw-63-BUSY,1,Voicemail(b${ext})
-exten => sw-63-BUSY,2,Goto(s|10)
-exten => sw-63-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-63-DONTCALL,2,Goto(s|10)
-exten => sw-63-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-63-TORTURE,2,Goto(s|10)
+exten => _sw-63-.,10,Voicemail(u${ext})
+exten => _sw-63-.,11,Goto(s|10)
+exten => sw-63-NOANSWER,10,Voicemail(u${ext})
+exten => sw-63-NOANSWER,11,Goto(s|10)
+exten => sw-63-ANSWER,10,Goto(s|10)
+exten => sw-63-BUSY,10,Voicemail(b${ext})
+exten => sw-63-BUSY,11,Goto(s|10)
+exten => sw-63-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-63-DONTCALL,11,Goto(s|10)
+exten => sw-63-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-63-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_62]
@@ -1561,20 +1561,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-64-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-64-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_62-64)
 exten => s,11,Return()
-exten => _sw-64-.,1,Voicemail(u${ext})
-exten => _sw-64-.,2,Goto(s|10)
-exten => sw-64-NOANSWER,1,Voicemail(u${ext})
-exten => sw-64-NOANSWER,2,Goto(s|10)
-exten => sw-64-ANSWER,1,Goto(s|10)
-exten => sw-64-BUSY,1,Voicemail(b${ext})
-exten => sw-64-BUSY,2,Goto(s|10)
-exten => sw-64-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-64-DONTCALL,2,Goto(s|10)
-exten => sw-64-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-64-TORTURE,2,Goto(s|10)
+exten => _sw-64-.,10,Voicemail(u${ext})
+exten => _sw-64-.,11,Goto(s|10)
+exten => sw-64-NOANSWER,10,Voicemail(u${ext})
+exten => sw-64-NOANSWER,11,Goto(s|10)
+exten => sw-64-ANSWER,10,Goto(s|10)
+exten => sw-64-BUSY,10,Voicemail(b${ext})
+exten => sw-64-BUSY,11,Goto(s|10)
+exten => sw-64-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-64-DONTCALL,11,Goto(s|10)
+exten => sw-64-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-64-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_63]
@@ -1586,20 +1586,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-65-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-65-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_63-65)
 exten => s,11,Return()
-exten => _sw-65-.,1,Voicemail(u${ext})
-exten => _sw-65-.,2,Goto(s|10)
-exten => sw-65-NOANSWER,1,Voicemail(u${ext})
-exten => sw-65-NOANSWER,2,Goto(s|10)
-exten => sw-65-ANSWER,1,Goto(s|10)
-exten => sw-65-BUSY,1,Voicemail(b${ext})
-exten => sw-65-BUSY,2,Goto(s|10)
-exten => sw-65-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-65-DONTCALL,2,Goto(s|10)
-exten => sw-65-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-65-TORTURE,2,Goto(s|10)
+exten => _sw-65-.,10,Voicemail(u${ext})
+exten => _sw-65-.,11,Goto(s|10)
+exten => sw-65-NOANSWER,10,Voicemail(u${ext})
+exten => sw-65-NOANSWER,11,Goto(s|10)
+exten => sw-65-ANSWER,10,Goto(s|10)
+exten => sw-65-BUSY,10,Voicemail(b${ext})
+exten => sw-65-BUSY,11,Goto(s|10)
+exten => sw-65-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-65-DONTCALL,11,Goto(s|10)
+exten => sw-65-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-65-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_64]
@@ -1611,20 +1611,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-66-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-66-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_64-66)
 exten => s,11,Return()
-exten => _sw-66-.,1,Voicemail(u${ext})
-exten => _sw-66-.,2,Goto(s|10)
-exten => sw-66-NOANSWER,1,Voicemail(u${ext})
-exten => sw-66-NOANSWER,2,Goto(s|10)
-exten => sw-66-ANSWER,1,Goto(s|10)
-exten => sw-66-BUSY,1,Voicemail(b${ext})
-exten => sw-66-BUSY,2,Goto(s|10)
-exten => sw-66-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-66-DONTCALL,2,Goto(s|10)
-exten => sw-66-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-66-TORTURE,2,Goto(s|10)
+exten => _sw-66-.,10,Voicemail(u${ext})
+exten => _sw-66-.,11,Goto(s|10)
+exten => sw-66-NOANSWER,10,Voicemail(u${ext})
+exten => sw-66-NOANSWER,11,Goto(s|10)
+exten => sw-66-ANSWER,10,Goto(s|10)
+exten => sw-66-BUSY,10,Voicemail(b${ext})
+exten => sw-66-BUSY,11,Goto(s|10)
+exten => sw-66-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-66-DONTCALL,11,Goto(s|10)
+exten => sw-66-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-66-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_65]
@@ -1636,20 +1636,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-67-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-67-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_65-67)
 exten => s,11,Return()
-exten => _sw-67-.,1,Voicemail(u${ext})
-exten => _sw-67-.,2,Goto(s|10)
-exten => sw-67-NOANSWER,1,Voicemail(u${ext})
-exten => sw-67-NOANSWER,2,Goto(s|10)
-exten => sw-67-ANSWER,1,Goto(s|10)
-exten => sw-67-BUSY,1,Voicemail(b${ext})
-exten => sw-67-BUSY,2,Goto(s|10)
-exten => sw-67-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-67-DONTCALL,2,Goto(s|10)
-exten => sw-67-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-67-TORTURE,2,Goto(s|10)
+exten => _sw-67-.,10,Voicemail(u${ext})
+exten => _sw-67-.,11,Goto(s|10)
+exten => sw-67-NOANSWER,10,Voicemail(u${ext})
+exten => sw-67-NOANSWER,11,Goto(s|10)
+exten => sw-67-ANSWER,10,Goto(s|10)
+exten => sw-67-BUSY,10,Voicemail(b${ext})
+exten => sw-67-BUSY,11,Goto(s|10)
+exten => sw-67-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-67-DONTCALL,11,Goto(s|10)
+exten => sw-67-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-67-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_66]
@@ -1661,20 +1661,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-68-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-68-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_66-68)
 exten => s,11,Return()
-exten => _sw-68-.,1,Voicemail(u${ext})
-exten => _sw-68-.,2,Goto(s|10)
-exten => sw-68-NOANSWER,1,Voicemail(u${ext})
-exten => sw-68-NOANSWER,2,Goto(s|10)
-exten => sw-68-ANSWER,1,Goto(s|10)
-exten => sw-68-BUSY,1,Voicemail(b${ext})
-exten => sw-68-BUSY,2,Goto(s|10)
-exten => sw-68-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-68-DONTCALL,2,Goto(s|10)
-exten => sw-68-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-68-TORTURE,2,Goto(s|10)
+exten => _sw-68-.,10,Voicemail(u${ext})
+exten => _sw-68-.,11,Goto(s|10)
+exten => sw-68-NOANSWER,10,Voicemail(u${ext})
+exten => sw-68-NOANSWER,11,Goto(s|10)
+exten => sw-68-ANSWER,10,Goto(s|10)
+exten => sw-68-BUSY,10,Voicemail(b${ext})
+exten => sw-68-BUSY,11,Goto(s|10)
+exten => sw-68-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-68-DONTCALL,11,Goto(s|10)
+exten => sw-68-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-68-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_67]
@@ -1686,20 +1686,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-69-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-69-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_67-69)
 exten => s,11,Return()
-exten => _sw-69-.,1,Voicemail(u${ext})
-exten => _sw-69-.,2,Goto(s|10)
-exten => sw-69-NOANSWER,1,Voicemail(u${ext})
-exten => sw-69-NOANSWER,2,Goto(s|10)
-exten => sw-69-ANSWER,1,Goto(s|10)
-exten => sw-69-BUSY,1,Voicemail(b${ext})
-exten => sw-69-BUSY,2,Goto(s|10)
-exten => sw-69-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-69-DONTCALL,2,Goto(s|10)
-exten => sw-69-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-69-TORTURE,2,Goto(s|10)
+exten => _sw-69-.,10,Voicemail(u${ext})
+exten => _sw-69-.,11,Goto(s|10)
+exten => sw-69-NOANSWER,10,Voicemail(u${ext})
+exten => sw-69-NOANSWER,11,Goto(s|10)
+exten => sw-69-ANSWER,10,Goto(s|10)
+exten => sw-69-BUSY,10,Voicemail(b${ext})
+exten => sw-69-BUSY,11,Goto(s|10)
+exten => sw-69-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-69-DONTCALL,11,Goto(s|10)
+exten => sw-69-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-69-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_68]
@@ -1711,20 +1711,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-70-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-70-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_68-70)
 exten => s,11,Return()
-exten => _sw-70-.,1,Voicemail(u${ext})
-exten => _sw-70-.,2,Goto(s|10)
-exten => sw-70-NOANSWER,1,Voicemail(u${ext})
-exten => sw-70-NOANSWER,2,Goto(s|10)
-exten => sw-70-ANSWER,1,Goto(s|10)
-exten => sw-70-BUSY,1,Voicemail(b${ext})
-exten => sw-70-BUSY,2,Goto(s|10)
-exten => sw-70-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-70-DONTCALL,2,Goto(s|10)
-exten => sw-70-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-70-TORTURE,2,Goto(s|10)
+exten => _sw-70-.,10,Voicemail(u${ext})
+exten => _sw-70-.,11,Goto(s|10)
+exten => sw-70-NOANSWER,10,Voicemail(u${ext})
+exten => sw-70-NOANSWER,11,Goto(s|10)
+exten => sw-70-ANSWER,10,Goto(s|10)
+exten => sw-70-BUSY,10,Voicemail(b${ext})
+exten => sw-70-BUSY,11,Goto(s|10)
+exten => sw-70-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-70-DONTCALL,11,Goto(s|10)
+exten => sw-70-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-70-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_69]
@@ -1736,20 +1736,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-71-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-71-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_69-71)
 exten => s,11,Return()
-exten => _sw-71-.,1,Voicemail(u${ext})
-exten => _sw-71-.,2,Goto(s|10)
-exten => sw-71-NOANSWER,1,Voicemail(u${ext})
-exten => sw-71-NOANSWER,2,Goto(s|10)
-exten => sw-71-ANSWER,1,Goto(s|10)
-exten => sw-71-BUSY,1,Voicemail(b${ext})
-exten => sw-71-BUSY,2,Goto(s|10)
-exten => sw-71-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-71-DONTCALL,2,Goto(s|10)
-exten => sw-71-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-71-TORTURE,2,Goto(s|10)
+exten => _sw-71-.,10,Voicemail(u${ext})
+exten => _sw-71-.,11,Goto(s|10)
+exten => sw-71-NOANSWER,10,Voicemail(u${ext})
+exten => sw-71-NOANSWER,11,Goto(s|10)
+exten => sw-71-ANSWER,10,Goto(s|10)
+exten => sw-71-BUSY,10,Voicemail(b${ext})
+exten => sw-71-BUSY,11,Goto(s|10)
+exten => sw-71-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-71-DONTCALL,11,Goto(s|10)
+exten => sw-71-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-71-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_70]
@@ -1761,20 +1761,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-72-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-72-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_70-72)
 exten => s,11,Return()
-exten => _sw-72-.,1,Voicemail(u${ext})
-exten => _sw-72-.,2,Goto(s|10)
-exten => sw-72-NOANSWER,1,Voicemail(u${ext})
-exten => sw-72-NOANSWER,2,Goto(s|10)
-exten => sw-72-ANSWER,1,Goto(s|10)
-exten => sw-72-BUSY,1,Voicemail(b${ext})
-exten => sw-72-BUSY,2,Goto(s|10)
-exten => sw-72-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-72-DONTCALL,2,Goto(s|10)
-exten => sw-72-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-72-TORTURE,2,Goto(s|10)
+exten => _sw-72-.,10,Voicemail(u${ext})
+exten => _sw-72-.,11,Goto(s|10)
+exten => sw-72-NOANSWER,10,Voicemail(u${ext})
+exten => sw-72-NOANSWER,11,Goto(s|10)
+exten => sw-72-ANSWER,10,Goto(s|10)
+exten => sw-72-BUSY,10,Voicemail(b${ext})
+exten => sw-72-BUSY,11,Goto(s|10)
+exten => sw-72-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-72-DONTCALL,11,Goto(s|10)
+exten => sw-72-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-72-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_71]
@@ -1786,20 +1786,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-73-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-73-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_71-73)
 exten => s,11,Return()
-exten => _sw-73-.,1,Voicemail(u${ext})
-exten => _sw-73-.,2,Goto(s|10)
-exten => sw-73-NOANSWER,1,Voicemail(u${ext})
-exten => sw-73-NOANSWER,2,Goto(s|10)
-exten => sw-73-ANSWER,1,Goto(s|10)
-exten => sw-73-BUSY,1,Voicemail(b${ext})
-exten => sw-73-BUSY,2,Goto(s|10)
-exten => sw-73-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-73-DONTCALL,2,Goto(s|10)
-exten => sw-73-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-73-TORTURE,2,Goto(s|10)
+exten => _sw-73-.,10,Voicemail(u${ext})
+exten => _sw-73-.,11,Goto(s|10)
+exten => sw-73-NOANSWER,10,Voicemail(u${ext})
+exten => sw-73-NOANSWER,11,Goto(s|10)
+exten => sw-73-ANSWER,10,Goto(s|10)
+exten => sw-73-BUSY,10,Voicemail(b${ext})
+exten => sw-73-BUSY,11,Goto(s|10)
+exten => sw-73-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-73-DONTCALL,11,Goto(s|10)
+exten => sw-73-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-73-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_72]
@@ -1811,20 +1811,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-74-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-74-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_72-74)
 exten => s,11,Return()
-exten => _sw-74-.,1,Voicemail(u${ext})
-exten => _sw-74-.,2,Goto(s|10)
-exten => sw-74-NOANSWER,1,Voicemail(u${ext})
-exten => sw-74-NOANSWER,2,Goto(s|10)
-exten => sw-74-ANSWER,1,Goto(s|10)
-exten => sw-74-BUSY,1,Voicemail(b${ext})
-exten => sw-74-BUSY,2,Goto(s|10)
-exten => sw-74-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-74-DONTCALL,2,Goto(s|10)
-exten => sw-74-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-74-TORTURE,2,Goto(s|10)
+exten => _sw-74-.,10,Voicemail(u${ext})
+exten => _sw-74-.,11,Goto(s|10)
+exten => sw-74-NOANSWER,10,Voicemail(u${ext})
+exten => sw-74-NOANSWER,11,Goto(s|10)
+exten => sw-74-ANSWER,10,Goto(s|10)
+exten => sw-74-BUSY,10,Voicemail(b${ext})
+exten => sw-74-BUSY,11,Goto(s|10)
+exten => sw-74-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-74-DONTCALL,11,Goto(s|10)
+exten => sw-74-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-74-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten_73]
@@ -1836,20 +1836,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-75-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-75-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten_73-75)
 exten => s,11,Return()
-exten => _sw-75-.,1,Voicemail(u${ext})
-exten => _sw-75-.,2,Goto(s|10)
-exten => sw-75-NOANSWER,1,Voicemail(u${ext})
-exten => sw-75-NOANSWER,2,Goto(s|10)
-exten => sw-75-ANSWER,1,Goto(s|10)
-exten => sw-75-BUSY,1,Voicemail(b${ext})
-exten => sw-75-BUSY,2,Goto(s|10)
-exten => sw-75-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-75-DONTCALL,2,Goto(s|10)
-exten => sw-75-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-75-TORTURE,2,Goto(s|10)
+exten => _sw-75-.,10,Voicemail(u${ext})
+exten => _sw-75-.,11,Goto(s|10)
+exten => sw-75-NOANSWER,10,Voicemail(u${ext})
+exten => sw-75-NOANSWER,11,Goto(s|10)
+exten => sw-75-ANSWER,10,Goto(s|10)
+exten => sw-75-BUSY,10,Voicemail(b${ext})
+exten => sw-75-BUSY,11,Goto(s|10)
+exten => sw-75-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-75-DONTCALL,11,Goto(s|10)
+exten => sw-75-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-75-TORTURE,11,Goto(s|10)
 
 
 [std-priv-exten]
@@ -1861,20 +1861,20 @@ exten => s,5,Set(torcont=${ARG5})
 exten => s,6,Set(dontcont=${ARG6})
 exten => s,7,Dial(${dev}|${timeout}|${opts})
 exten => s,8,NoOp(${DIALSTATUS} was chosen)
-exten => s,9,Goto(sw-76-${DIALSTATUS}|1)
+exten => s,9,Goto(sw-76-${DIALSTATUS}|10)
 exten => s,10,NoOp(Finish switch-std-priv-exten-76)
 exten => s,11,Return()
-exten => _sw-76-.,1,Voicemail(u${ext})
-exten => _sw-76-.,2,Goto(s|10)
-exten => sw-76-NOANSWER,1,Voicemail(u${ext})
-exten => sw-76-NOANSWER,2,Goto(s|10)
-exten => sw-76-ANSWER,1,Goto(s|10)
-exten => sw-76-BUSY,1,Voicemail(b${ext})
-exten => sw-76-BUSY,2,Goto(s|10)
-exten => sw-76-DONTCALL,1,Goto(${dontcont}|s|begin)
-exten => sw-76-DONTCALL,2,Goto(s|10)
-exten => sw-76-TORTURE,1,Goto(${torcont}|s|begin)
-exten => sw-76-TORTURE,2,Goto(s|10)
+exten => _sw-76-.,10,Voicemail(u${ext})
+exten => _sw-76-.,11,Goto(s|10)
+exten => sw-76-NOANSWER,10,Voicemail(u${ext})
+exten => sw-76-NOANSWER,11,Goto(s|10)
+exten => sw-76-ANSWER,10,Goto(s|10)
+exten => sw-76-BUSY,10,Voicemail(b${ext})
+exten => sw-76-BUSY,11,Goto(s|10)
+exten => sw-76-DONTCALL,10,Goto(${dontcont}|s|begin)
+exten => sw-76-DONTCALL,11,Goto(s|10)
+exten => sw-76-TORTURE,10,Goto(${torcont}|s|begin)
+exten => sw-76-TORTURE,11,Goto(s|10)
 
 
 [fillcidname]
@@ -2019,7 +2019,7 @@ exten => s,30,Playback(greetings/direct)
 exten => s,31,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
 exten => s,32,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 exten => s,33,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
-exten => s,34,Goto(sw-92-${direct}|1)
+exten => s,34,Goto(sw-92-${direct}|10)
 exten => s,35,NoOp(Finish switch-if-homeline-91-92)
 exten => s,36,NoOp(Finish if-homeline-91)
 exten => s,37(loopback),GotoIfTime(*|*|20-25|dec?39)
@@ -2089,12 +2089,12 @@ exten => s,100,NoOp(Finish iftime-iftime-iftime-homeline-93-94-95)
 exten => s,101,NoOp(Finish iftime-iftime-homeline-93-94)
 exten => s,102,NoOp(Finish iftime-homeline-93)
 exten => s,103,Background(murphy-homeline-intro1)
-exten => _sw-92-.,1,Set(z=${direct}-2)
-exten => _sw-92-.,2,Goto(homeline-kids|${z}|1)
-exten => sw-92-2,1,Gosub(std-priv-exten|s|1(Zap/3r1&Zap/5r1|2|25|mtw|telemarket|telemarket))
-exten => sw-92-2,2,Goto(s|loopback)
-exten => sw-92-1,1,Gosub(std-priv-exten|s|1(Zap/6r3&Sip/murf|1|25|mpA(beep)tw|telemarket|telemarket))
-exten => sw-92-1,2,Goto(s|loopback)
+exten => _sw-92-.,10,Set(z=${direct}-2)
+exten => _sw-92-.,11,Goto(homeline-kids|${z}|1)
+exten => sw-92-2,10,Gosub(std-priv-exten|s|1(Zap/3r1&Zap/5r1|2|25|mtw|telemarket|telemarket))
+exten => sw-92-2,11,Goto(s|loopback)
+exten => sw-92-1,10,Gosub(std-priv-exten|s|1(Zap/6r3&Sip/murf|1|25|mpA(beep)tw|telemarket|telemarket))
+exten => sw-92-1,11,Goto(s|loopback)
 exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten|s|1(Zap/3r1&Zap/5r1|2|25|mtw|telemarket|telemarket))