Updated the regressions on AEL. Hadn't updated

this for the changes I made to preserve ${EXTEN}
in switches, which affected several tests because
it adds extra priorities, and at least one needed to be updated
because of the removal of the empty extension warning
message.



git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@119966 f38db490-d61c-443f-a65b-d21fe96a405b

9 files changed, 879 insertions, 796 deletions

diff --git a/pbx/ael/ael-test/ref.ael-ntest10 b/pbx/ael/ael-test/ref.ael-ntest10
index 72a0c8172..eaff1ea35 100644
--- a/pbx/ael/ael-test/ref.ael-ntest10
+++ b/pbx/ael/ael-test/ref.ael-ntest10
@@ -5,20 +5,20 @@
 
 
 (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c  line:4069 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:4076 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4084 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pbx_ael.c  line:2234 func: check_switch_expr  Warning: file ./extensions.ael, line 13-13: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2234 func: check_switch_expr  Warning: file ./extensions.ael, line 36-36: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2234 func: check_switch_expr  Warning: file ./extensions.ael, line 48-48: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2234 func: check_switch_expr  Warning: file ./extensions.ael, line 60-60: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2234 func: check_switch_expr  Warning: file ./extensions.ael, line 72-72: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2234 func: check_switch_expr  Warning: file ./extensions.ael, line 84-84: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2234 func: check_switch_expr  Warning: file ./extensions.ael, line 87-87: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2234 func: check_switch_expr  Warning: file ./extensions.ael, line 106-106: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2234 func: check_switch_expr  Warning: file ./extensions.ael, line 119-119: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:2234 func: check_switch_expr  Warning: file ./extensions.ael, line 122-122: A default case was automatically added to the switch.
-LOG: lev:2 file:pbx_ael.c  line:4087 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4131 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:4138 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4146 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 13-13: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 36-36: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 48-48: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 60-60: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 72-72: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 84-84: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 87-87: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 106-106: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 119-119: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 122-122: A default case was automatically added to the switch.
+LOG: lev:2 file:pbx_ael.c  line:4149 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
 Executed ast_context_create(conts, name=macro-endsess, registrar=pbx_ael);
 Executed ast_context_create(conts, name=macro-nullchk, registrar=pbx_ael);
 Executed ast_context_create(conts, name=macro-endcall, registrar=pbx_ael);
@@ -30,9 +30,10 @@ Executed ast_add_extension2(context=macro-endsess, rep=0, exten=s, priority=1, l
 Executed ast_add_extension2(context=macro-nullchk, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=type=${ARG1}, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-nullchk, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=NoOp, data=${type} is this, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=type=${ARG1}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Goto, data=sw-1-${type}|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall-1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall, rep=0, exten=_sw-1-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|3, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Goto, data=sw-1-${type}|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall-1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall, rep=0, exten=_sw-1-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|4, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall, rep=0, exten=sw-1-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-1-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall, rep=0, exten=sw-1-out, priority=10, label=(null), callerid=(null), appl=Macro, data=nullchk|callid, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall, rep=0, exten=sw-1-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:15, FREE, registrar=pbx_ael);
@@ -40,17 +41,18 @@ Executed ast_add_extension2(context=macro-endcall, rep=0, exten=sw-1-out, priori
 Executed ast_add_extension2(context=macro-endcall, rep=0, exten=sw-1-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-1-out|ptr1, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall, rep=0, exten=sw-1-out, priority=14, label=(null), callerid=(null), appl=Goto, data=17, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall, rep=0, exten=sw-1-out, priority=15, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall, rep=0, exten=sw-1-out, priority=16, label=(null), callerid=(null), appl=Goto, data=s|3, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall, rep=0, exten=sw-1-out, priority=16, label=(null), callerid=(null), appl=Goto, data=s|4, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall, rep=0, exten=sw-1-out, priority=17, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall-out-1-2, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall, rep=0, exten=sw-1-out, priority=18, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall, rep=0, exten=sw-1-out, priority=19, label=(null), callerid=(null), appl=Goto, data=sw-1-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=type=${ARG1}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Goto, data=sw-3-${type}|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall2-3, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=_sw-3-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|3, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Goto, data=sw-3-${type}|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall2-3, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=_sw-3-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|4, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=sw-3-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-3-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=sw-3-out2, priority=10, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=sw-3-out2, priority=11, label=(null), callerid=(null), appl=Goto, data=s|3, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=sw-3-out2, priority=11, label=(null), callerid=(null), appl=Goto, data=s|4, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=sw-3-out2, priority=12, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=sw-3-out2, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-3-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=sw-3-out, priority=10, label=(null), callerid=(null), appl=Macro, data=nullchk|callid, FREE, registrar=pbx_ael);
@@ -60,22 +62,23 @@ Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=sw-3-out, prior
 Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=sw-3-out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall2-out-3-4, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall2, rep=0, exten=sw-3-out, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-3-out2|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=type=${ARG1}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Goto, data=sw-5-${type}|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall3-5, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?5:6, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=Goto, data=sw-8-out|ptr1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=NoOp, data=Finish if-endcall3-7, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=Goto, data=sw-8-${type}|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall3-8, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=_sw-8-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|8, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Goto, data=sw-5-${type}|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall3-5, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?6:7, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=Goto, data=sw-8-out|ptr1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=NoOp, data=Finish if-endcall3-7, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=Goto, data=sw-8-${type}|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall3-8, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=_sw-8-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|9, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-8-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-8-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-8-out, priority=10, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?11:13, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-8-out, priority=11, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-8-out, priority=12, label=(null), callerid=(null), appl=Goto, data=s|8, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-8-out, priority=12, label=(null), callerid=(null), appl=Goto, data=s|9, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-8-out, priority=13, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall3-out-8-9, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-8-out, priority=14, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-8-out, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-8-.|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=_sw-5-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|3, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=_sw-5-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|4, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-5-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-5-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-5-out, priority=10, label=(null), callerid=(null), appl=Macro, data=nullchk|callid, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-5-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
@@ -85,27 +88,29 @@ Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-5-out, prior
 Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-5-out, priority=15, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall3, rep=0, exten=sw-5-out, priority=16, label=(null), callerid=(null), appl=Goto, data=sw-5-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=type=${ARG1}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Goto, data=sw-10-${type}|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall4-10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?5:6, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=Goto, data=sw-14-in|ptr1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=NoOp, data=Finish if-endcall4-12, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=Goto, data=sw-13-${type}|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall4-13, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=_sw-13-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|8, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Goto, data=sw-10-${type}|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall4-10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?6:7, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=Goto, data=sw-14-in|ptr1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=NoOp, data=Finish if-endcall4-12, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=Goto, data=sw-13-${type}|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall4-13, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=_sw-13-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|9, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-13-.|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-14-${type}|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=11, label=(null), callerid=(null), appl=NoOp, data=Finish switch-sw-endcall4-out-13-14, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-13-.|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=_sw-14-., priority=10, label=(null), callerid=(null), appl=Goto, data=sw-13-out|11, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=10, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=11, label=(null), callerid=(null), appl=Goto, data=sw-14-${type}|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=12, label=(null), callerid=(null), appl=NoOp, data=Finish switch-sw-endcall4-out-13-14, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-13-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-13-.|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=_sw-14-., priority=10, label=(null), callerid=(null), appl=Goto, data=sw-13-out|12, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-14-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=10, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?11:13, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=11, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-13-out|11, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-13-out|12, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=13, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-sw-endcall4-out-13-in-14-15, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=14, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-14-in, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-14-.|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=_sw-10-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|3, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=_sw-10-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|4, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-10-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-10-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-10-out, priority=10, label=(null), callerid=(null), appl=Macro, data=nullchk|callid, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-10-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
@@ -115,27 +120,29 @@ Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-10-out, prio
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-10-out, priority=15, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall4, rep=0, exten=sw-10-out, priority=16, label=(null), callerid=(null), appl=Goto, data=sw-10-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=type=${ARG1}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Goto, data=sw-16-${type}|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall5-16, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?5:6, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=Goto, data=sw-21-in|ptr1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=NoOp, data=Finish if-endcall5-19, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=Goto, data=sw-20-${type}|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall5-20, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=_sw-20-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|8, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Goto, data=sw-16-${type}|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall5-16, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?6:7, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=Goto, data=sw-21-in|ptr1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=NoOp, data=Finish if-endcall5-19, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=Goto, data=sw-20-${type}|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=NoOp, data=Finish switch-endcall5-20, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=_sw-20-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|9, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-20-.|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-21-${type}|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=11, label=(null), callerid=(null), appl=NoOp, data=Finish switch-sw-endcall5-out-20-21, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-20-.|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=_sw-21-., priority=10, label=(null), callerid=(null), appl=Goto, data=sw-20-out|11, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=10, label=(null), callerid=(null), appl=Set, data=~~EXTEN~~=${EXTEN}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=11, label=(null), callerid=(null), appl=Goto, data=sw-21-${type}|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=12, label=(null), callerid=(null), appl=NoOp, data=Finish switch-sw-endcall5-out-20-21, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-20-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-20-.|10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=_sw-21-., priority=10, label=(null), callerid=(null), appl=Goto, data=sw-20-out|12, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-21-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=10, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?11:13, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=11, label=ptr1, callerid=(null), appl=Softhangup, data=${CHANNEL}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-20-out|11, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=12, label=(null), callerid=(null), appl=Goto, data=sw-20-out|12, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=13, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-sw-endcall5-out-20-in-21-22, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=14, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-21-in, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-21-.|10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=_sw-16-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|3, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=_sw-16-., priority=10, label=(null), callerid=(null), appl=Goto, data=s|4, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-16-, priority=10, label=(null), callerid=(null), appl=Goto, data=sw-16-.|10, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-16-in, priority=10, label=(null), callerid=(null), appl=Macro, data=nullchk|callid, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-16-in, priority=11, label=ptr2, callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
@@ -150,9 +157,9 @@ Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-16-out, prio
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-16-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-21-in|ptr1, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-16-out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall5-out-16-17, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=macro-endcall5, rep=0, exten=sw-16-out, priority=15, label=(null), callerid=(null), appl=Goto, data=sw-16-in|10, FREE, registrar=pbx_ael);
-LOG: lev:2 file:pbx_ael.c  line:4089 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4151 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
 Executed ast_merge_contexts_and_delete();
-LOG: lev:2 file:pbx_ael.c  line:4092 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4154 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
 Executed ast_walk_contexts();
-LOG: lev:2 file:pbx_ael.c  line:4095 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:527 func: main  7 contexts, 37 extensions, 124 priorities
+LOG: lev:2 file:pbx_ael.c  line:4157 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:543 func: main  7 contexts, 37 extensions, 131 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test1 b/pbx/ael/ael-test/ref.ael-test1
index 91ed1217f..97f8436bb 100644
--- a/pbx/ael/ael-test/ref.ael-test1
+++ b/pbx/ael/ael-test/ref.ael-test1
@@ -2,14 +2,14 @@
 (If you find progress and other non-error messages irritating, you can use -q to suppress them)
 
 (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c  line:4069 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:4076 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4084 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pbx_ael.c  line:2234 func: check_switch_expr  Warning: file ./extensions.ael, line 58-58: A default case was automatically added to the switch.
-LOG: lev:3 file:pbx_ael.c  line:937 func: check_dow  Warning: file ./extensions.ael, line 67-67: The day (m0n) must be one of 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', or 'sat'!
-LOG: lev:3 file:pbx_ael.c  line:895 func: check_timerange  Warning: file ./extensions.ael, line 78-78: The end time (25:00) is out of range!
-LOG: lev:2 file:pbx_ael.c  line:4087 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4089 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4092 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4095 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:527 func: main  5 contexts, 16 extensions, 159 priorities
+LOG: lev:2 file:pbx_ael.c  line:4131 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:4138 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4146 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:3 file:pbx_ael.c  line:2235 func: check_switch_expr  Warning: file ./extensions.ael, line 58-58: A default case was automatically added to the switch.
+LOG: lev:3 file:pbx_ael.c  line:938 func: check_dow  Warning: file ./extensions.ael, line 67-67: The day (m0n) must be one of 'sun', 'mon', 'tue', 'wed', 'thu', 'fri', or 'sat'!
+LOG: lev:3 file:pbx_ael.c  line:896 func: check_timerange  Warning: file ./extensions.ael, line 78-78: The end time (25:00) is out of range!
+LOG: lev:2 file:pbx_ael.c  line:4149 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4151 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4154 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4157 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:543 func: main  5 contexts, 16 extensions, 161 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test15 b/pbx/ael/ael-test/ref.ael-test15
index 56ed6781c..f56b37b21 100644
--- a/pbx/ael/ael-test/ref.ael-test15
+++ b/pbx/ael/ael-test/ref.ael-test15
@@ -2,12 +2,11 @@
 (If you find progress and other non-error messages irritating, you can use -q to suppress them)
 
 (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c  line:3803 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:3810 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:3818 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:3821 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:3 file:pbx_ael.c  line:3706 func: ast_compile_ael2  Warning: file ./extensions.ael, line 8-13: Empty Extension!
-LOG: lev:2 file:pbx_ael.c  line:3823 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:3826 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:3829 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:479 func: main  1 contexts, 0 extensions, 0 priorities
+LOG: lev:2 file:pbx_ael.c  line:4131 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:4138 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4146 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4149 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4151 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4154 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4157 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:543 func: main  1 contexts, 0 extensions, 0 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test18 b/pbx/ael/ael-test/ref.ael-test18
index a0972f55e..05047ad90 100644
--- a/pbx/ael/ael-test/ref.ael-test18
+++ b/pbx/ael/ael-test/ref.ael-test18
@@ -2,11 +2,11 @@
 (If you find progress and other non-error messages irritating, you can use -q to suppress them)
 
 (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c  line:4069 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:4076 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4084 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4087 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4089 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4092 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4095 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:527 func: main  1 contexts, 7 extensions, 27 priorities
+LOG: lev:2 file:pbx_ael.c  line:4131 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:4138 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4146 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4149 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4151 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4154 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4157 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:543 func: main  1 contexts, 7 extensions, 29 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test3 b/pbx/ael/ael-test/ref.ael-test3
index c36cd0d3a..86fcc3478 100644
--- a/pbx/ael/ael-test/ref.ael-test3
+++ b/pbx/ael/ael-test/ref.ael-test3
@@ -2,17 +2,17 @@
 (If you find progress and other non-error messages irritating, you can use -q to suppress them)
 
 (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c  line:4069 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:4076 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:ael.flex  line:654 func: setup_filestack    --Read in included file ./include1.ael2, 78 chars
-LOG: lev:2 file:ael.flex  line:654 func: setup_filestack    --Read in included file ./include2.ael2, 98 chars
-LOG: lev:2 file:ael.flex  line:654 func: setup_filestack    --Read in included file ./include3.ael2, 57 chars
-LOG: lev:2 file:ael.flex  line:654 func: setup_filestack    --Read in included file ./include5.ael2, 56 chars
-LOG: lev:2 file:ael.flex  line:654 func: setup_filestack    --Read in included file ./include4.ael2, 87 chars
-LOG: lev:2 file:ael.flex  line:654 func: setup_filestack    --Read in included file ./telemarket_torture.ael2, 28036 chars
-LOG: lev:2 file:pbx_ael.c  line:4084 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4087 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4089 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4092 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4095 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:527 func: main  172 contexts, 934 extensions, 2402 priorities
+LOG: lev:2 file:pbx_ael.c  line:4131 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:4138 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:ael.flex  line:663 func: setup_filestack    --Read in included file ./include1.ael2, 78 chars
+LOG: lev:2 file:ael.flex  line:663 func: setup_filestack    --Read in included file ./include2.ael2, 98 chars
+LOG: lev:2 file:ael.flex  line:663 func: setup_filestack    --Read in included file ./include3.ael2, 57 chars
+LOG: lev:2 file:ael.flex  line:663 func: setup_filestack    --Read in included file ./include5.ael2, 56 chars
+LOG: lev:2 file:ael.flex  line:663 func: setup_filestack    --Read in included file ./include4.ael2, 87 chars
+LOG: lev:2 file:ael.flex  line:663 func: setup_filestack    --Read in included file ./telemarket_torture.ael2, 28036 chars
+LOG: lev:2 file:pbx_ael.c  line:4146 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4149 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4151 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4154 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4157 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:543 func: main  172 contexts, 934 extensions, 2478 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test5 b/pbx/ael/ael-test/ref.ael-test5
index e7550e842..2ddb29c2b 100644
--- a/pbx/ael/ael-test/ref.ael-test5
+++ b/pbx/ael/ael-test/ref.ael-test5
@@ -2,11 +2,11 @@
 (If you find progress and other non-error messages irritating, you can use -q to suppress them)
 
 (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c  line:4069 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:4076 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4084 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4087 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4089 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4092 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4095 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:527 func: main  38 contexts, 91 extensions, 485 priorities
+LOG: lev:2 file:pbx_ael.c  line:4131 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:4138 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4146 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4149 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4151 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4154 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4157 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:543 func: main  38 contexts, 91 extensions, 486 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test8 b/pbx/ael/ael-test/ref.ael-test8
index 267b6a579..b6959205e 100644
--- a/pbx/ael/ael-test/ref.ael-test8
+++ b/pbx/ael/ael-test/ref.ael-test8
@@ -2,11 +2,11 @@
 (If you find progress and other non-error messages irritating, you can use -q to suppress them)
 
 (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c  line:4069 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:4076 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4084 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4087 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4089 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4092 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:4095 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:527 func: main  1 contexts, 7 extensions, 17 priorities
+LOG: lev:2 file:pbx_ael.c  line:4131 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:4138 func: pbx_load_module  AEL load process: calculated config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4146 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4149 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4151 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4154 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:4157 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:543 func: main  1 contexts, 7 extensions, 19 priorities
diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
index 1e65df293..1856c6c69 100644
--- a/pbx/ael/ael-test/ref.ael-vtest13
+++ b/pbx/ael/ael-test/ref.ael-vtest13
@@ -14,17 +14,18 @@ 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}|10)
-exten => s,5,NoOp(Finish switch-std-exten-1)
+exten => s,4,Set(~~EXTEN~~=${EXTEN})
+exten => s,5,Goto(sw-1-${DIALSTATUS}|10)
+exten => s,6,NoOp(Finish switch-std-exten-1)
 exten => a,1,VoiceMailMain(${ext})
 exten => _sw-1-.,10,Voicemail(u${ext})
-exten => _sw-1-.,11,Goto(s|5)
+exten => _sw-1-.,11,Goto(s|6)
 exten => sw-1-,10,Goto(sw-1-.|10)
-exten => sw-1-ANSWER,10,Goto(s|5)
+exten => sw-1-ANSWER,10,Goto(s|6)
 exten => sw-1-NOANSWER,10,Voicemail(u${ext})
-exten => sw-1-NOANSWER,11,Goto(s|5)
+exten => sw-1-NOANSWER,11,Goto(s|6)
 exten => sw-1-BUSY,10,Voicemail(b${ext})
-exten => sw-1-BUSY,11,Goto(s|5)
+exten => sw-1-BUSY,11,Goto(s|6)
 
 
 [macro-std-priv-exten_1]
@@ -36,20 +37,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_1-3)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-3-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_1-3)
 exten => _sw-3-.,10,Voicemail(u${ext})
-exten => _sw-3-.,11,Goto(s|10)
+exten => _sw-3-.,11,Goto(s|11)
 exten => sw-3-,10,Goto(sw-3-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-3-ANSWER,10,Goto(s|11)
 exten => sw-3-BUSY,10,Voicemail(b${ext})
-exten => sw-3-BUSY,11,Goto(s|10)
+exten => sw-3-BUSY,11,Goto(s|11)
 exten => sw-3-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-3-DONTCALL,11,Goto(s|10)
+exten => sw-3-DONTCALL,11,Goto(s|11)
 exten => sw-3-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-3-TORTURE,11,Goto(s|10)
+exten => sw-3-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_2]
@@ -61,20 +63,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_2-4)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-4-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_2-4)
 exten => _sw-4-.,10,Voicemail(u${ext})
-exten => _sw-4-.,11,Goto(s|10)
+exten => _sw-4-.,11,Goto(s|11)
 exten => sw-4-,10,Goto(sw-4-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-4-ANSWER,10,Goto(s|11)
 exten => sw-4-BUSY,10,Voicemail(b${ext})
-exten => sw-4-BUSY,11,Goto(s|10)
+exten => sw-4-BUSY,11,Goto(s|11)
 exten => sw-4-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-4-DONTCALL,11,Goto(s|10)
+exten => sw-4-DONTCALL,11,Goto(s|11)
 exten => sw-4-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-4-TORTURE,11,Goto(s|10)
+exten => sw-4-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_3]
@@ -86,20 +89,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_3-5)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-5-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_3-5)
 exten => _sw-5-.,10,Voicemail(u${ext})
-exten => _sw-5-.,11,Goto(s|10)
+exten => _sw-5-.,11,Goto(s|11)
 exten => sw-5-,10,Goto(sw-5-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-5-ANSWER,10,Goto(s|11)
 exten => sw-5-BUSY,10,Voicemail(b${ext})
-exten => sw-5-BUSY,11,Goto(s|10)
+exten => sw-5-BUSY,11,Goto(s|11)
 exten => sw-5-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-5-DONTCALL,11,Goto(s|10)
+exten => sw-5-DONTCALL,11,Goto(s|11)
 exten => sw-5-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-5-TORTURE,11,Goto(s|10)
+exten => sw-5-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_4]
@@ -111,20 +115,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_4-6)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-6-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_4-6)
 exten => _sw-6-.,10,Voicemail(u${ext})
-exten => _sw-6-.,11,Goto(s|10)
+exten => _sw-6-.,11,Goto(s|11)
 exten => sw-6-,10,Goto(sw-6-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-6-ANSWER,10,Goto(s|11)
 exten => sw-6-BUSY,10,Voicemail(b${ext})
-exten => sw-6-BUSY,11,Goto(s|10)
+exten => sw-6-BUSY,11,Goto(s|11)
 exten => sw-6-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-6-DONTCALL,11,Goto(s|10)
+exten => sw-6-DONTCALL,11,Goto(s|11)
 exten => sw-6-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-6-TORTURE,11,Goto(s|10)
+exten => sw-6-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_5]
@@ -136,20 +141,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_5-7)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-7-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_5-7)
 exten => _sw-7-.,10,Voicemail(u${ext})
-exten => _sw-7-.,11,Goto(s|10)
+exten => _sw-7-.,11,Goto(s|11)
 exten => sw-7-,10,Goto(sw-7-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-7-ANSWER,10,Goto(s|11)
 exten => sw-7-BUSY,10,Voicemail(b${ext})
-exten => sw-7-BUSY,11,Goto(s|10)
+exten => sw-7-BUSY,11,Goto(s|11)
 exten => sw-7-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-7-DONTCALL,11,Goto(s|10)
+exten => sw-7-DONTCALL,11,Goto(s|11)
 exten => sw-7-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-7-TORTURE,11,Goto(s|10)
+exten => sw-7-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_6]
@@ -161,20 +167,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_6-8)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-8-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_6-8)
 exten => _sw-8-.,10,Voicemail(u${ext})
-exten => _sw-8-.,11,Goto(s|10)
+exten => _sw-8-.,11,Goto(s|11)
 exten => sw-8-,10,Goto(sw-8-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-8-ANSWER,10,Goto(s|11)
 exten => sw-8-BUSY,10,Voicemail(b${ext})
-exten => sw-8-BUSY,11,Goto(s|10)
+exten => sw-8-BUSY,11,Goto(s|11)
 exten => sw-8-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-8-DONTCALL,11,Goto(s|10)
+exten => sw-8-DONTCALL,11,Goto(s|11)
 exten => sw-8-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-8-TORTURE,11,Goto(s|10)
+exten => sw-8-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_7]
@@ -186,20 +193,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_7-9)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-9-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_7-9)
 exten => _sw-9-.,10,Voicemail(u${ext})
-exten => _sw-9-.,11,Goto(s|10)
+exten => _sw-9-.,11,Goto(s|11)
 exten => sw-9-,10,Goto(sw-9-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-9-ANSWER,10,Goto(s|11)
 exten => sw-9-BUSY,10,Voicemail(b${ext})
-exten => sw-9-BUSY,11,Goto(s|10)
+exten => sw-9-BUSY,11,Goto(s|11)
 exten => sw-9-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-9-DONTCALL,11,Goto(s|10)
+exten => sw-9-DONTCALL,11,Goto(s|11)
 exten => sw-9-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-9-TORTURE,11,Goto(s|10)
+exten => sw-9-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_8]
@@ -211,20 +219,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_8-10)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-10-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_8-10)
 exten => _sw-10-.,10,Voicemail(u${ext})
-exten => _sw-10-.,11,Goto(s|10)
+exten => _sw-10-.,11,Goto(s|11)
 exten => sw-10-,10,Goto(sw-10-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-10-ANSWER,10,Goto(s|11)
 exten => sw-10-BUSY,10,Voicemail(b${ext})
-exten => sw-10-BUSY,11,Goto(s|10)
+exten => sw-10-BUSY,11,Goto(s|11)
 exten => sw-10-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-10-DONTCALL,11,Goto(s|10)
+exten => sw-10-DONTCALL,11,Goto(s|11)
 exten => sw-10-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-10-TORTURE,11,Goto(s|10)
+exten => sw-10-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_9]
@@ -236,20 +245,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_9-11)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-11-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_9-11)
 exten => _sw-11-.,10,Voicemail(u${ext})
-exten => _sw-11-.,11,Goto(s|10)
+exten => _sw-11-.,11,Goto(s|11)
 exten => sw-11-,10,Goto(sw-11-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-11-ANSWER,10,Goto(s|11)
 exten => sw-11-BUSY,10,Voicemail(b${ext})
-exten => sw-11-BUSY,11,Goto(s|10)
+exten => sw-11-BUSY,11,Goto(s|11)
 exten => sw-11-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-11-DONTCALL,11,Goto(s|10)
+exten => sw-11-DONTCALL,11,Goto(s|11)
 exten => sw-11-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-11-TORTURE,11,Goto(s|10)
+exten => sw-11-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_10]
@@ -261,20 +271,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_10-12)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-12-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_10-12)
 exten => _sw-12-.,10,Voicemail(u${ext})
-exten => _sw-12-.,11,Goto(s|10)
+exten => _sw-12-.,11,Goto(s|11)
 exten => sw-12-,10,Goto(sw-12-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-12-ANSWER,10,Goto(s|11)
 exten => sw-12-BUSY,10,Voicemail(b${ext})
-exten => sw-12-BUSY,11,Goto(s|10)
+exten => sw-12-BUSY,11,Goto(s|11)
 exten => sw-12-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-12-DONTCALL,11,Goto(s|10)
+exten => sw-12-DONTCALL,11,Goto(s|11)
 exten => sw-12-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-12-TORTURE,11,Goto(s|10)
+exten => sw-12-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_11]
@@ -286,20 +297,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_11-13)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-13-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_11-13)
 exten => _sw-13-.,10,Voicemail(u${ext})
-exten => _sw-13-.,11,Goto(s|10)
+exten => _sw-13-.,11,Goto(s|11)
 exten => sw-13-,10,Goto(sw-13-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-13-ANSWER,10,Goto(s|11)
 exten => sw-13-BUSY,10,Voicemail(b${ext})
-exten => sw-13-BUSY,11,Goto(s|10)
+exten => sw-13-BUSY,11,Goto(s|11)
 exten => sw-13-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-13-DONTCALL,11,Goto(s|10)
+exten => sw-13-DONTCALL,11,Goto(s|11)
 exten => sw-13-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-13-TORTURE,11,Goto(s|10)
+exten => sw-13-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_12]
@@ -311,20 +323,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_12-14)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-14-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_12-14)
 exten => _sw-14-.,10,Voicemail(u${ext})
-exten => _sw-14-.,11,Goto(s|10)
+exten => _sw-14-.,11,Goto(s|11)
 exten => sw-14-,10,Goto(sw-14-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-14-ANSWER,10,Goto(s|11)
 exten => sw-14-BUSY,10,Voicemail(b${ext})
-exten => sw-14-BUSY,11,Goto(s|10)
+exten => sw-14-BUSY,11,Goto(s|11)
 exten => sw-14-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-14-DONTCALL,11,Goto(s|10)
+exten => sw-14-DONTCALL,11,Goto(s|11)
 exten => sw-14-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-14-TORTURE,11,Goto(s|10)
+exten => sw-14-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_13]
@@ -336,20 +349,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_13-15)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-15-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_13-15)
 exten => _sw-15-.,10,Voicemail(u${ext})
-exten => _sw-15-.,11,Goto(s|10)
+exten => _sw-15-.,11,Goto(s|11)
 exten => sw-15-,10,Goto(sw-15-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-15-ANSWER,10,Goto(s|11)
 exten => sw-15-BUSY,10,Voicemail(b${ext})
-exten => sw-15-BUSY,11,Goto(s|10)
+exten => sw-15-BUSY,11,Goto(s|11)
 exten => sw-15-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-15-DONTCALL,11,Goto(s|10)
+exten => sw-15-DONTCALL,11,Goto(s|11)
 exten => sw-15-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-15-TORTURE,11,Goto(s|10)
+exten => sw-15-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_14]
@@ -361,20 +375,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_14-16)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-16-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_14-16)
 exten => _sw-16-.,10,Voicemail(u${ext})
-exten => _sw-16-.,11,Goto(s|10)
+exten => _sw-16-.,11,Goto(s|11)
 exten => sw-16-,10,Goto(sw-16-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-16-ANSWER,10,Goto(s|11)
 exten => sw-16-BUSY,10,Voicemail(b${ext})
-exten => sw-16-BUSY,11,Goto(s|10)
+exten => sw-16-BUSY,11,Goto(s|11)
 exten => sw-16-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-16-DONTCALL,11,Goto(s|10)
+exten => sw-16-DONTCALL,11,Goto(s|11)
 exten => sw-16-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-16-TORTURE,11,Goto(s|10)
+exten => sw-16-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_15]
@@ -386,20 +401,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_15-17)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-17-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_15-17)
 exten => _sw-17-.,10,Voicemail(u${ext})
-exten => _sw-17-.,11,Goto(s|10)
+exten => _sw-17-.,11,Goto(s|11)
 exten => sw-17-,10,Goto(sw-17-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-17-ANSWER,10,Goto(s|11)
 exten => sw-17-BUSY,10,Voicemail(b${ext})
-exten => sw-17-BUSY,11,Goto(s|10)
+exten => sw-17-BUSY,11,Goto(s|11)
 exten => sw-17-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-17-DONTCALL,11,Goto(s|10)
+exten => sw-17-DONTCALL,11,Goto(s|11)
 exten => sw-17-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-17-TORTURE,11,Goto(s|10)
+exten => sw-17-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_16]
@@ -411,20 +427,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_16-18)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-18-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_16-18)
 exten => _sw-18-.,10,Voicemail(u${ext})
-exten => _sw-18-.,11,Goto(s|10)
+exten => _sw-18-.,11,Goto(s|11)
 exten => sw-18-,10,Goto(sw-18-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-18-ANSWER,10,Goto(s|11)
 exten => sw-18-BUSY,10,Voicemail(b${ext})
-exten => sw-18-BUSY,11,Goto(s|10)
+exten => sw-18-BUSY,11,Goto(s|11)
 exten => sw-18-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-18-DONTCALL,11,Goto(s|10)
+exten => sw-18-DONTCALL,11,Goto(s|11)
 exten => sw-18-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-18-TORTURE,11,Goto(s|10)
+exten => sw-18-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_17]
@@ -436,20 +453,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_17-19)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-19-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_17-19)
 exten => _sw-19-.,10,Voicemail(u${ext})
-exten => _sw-19-.,11,Goto(s|10)
+exten => _sw-19-.,11,Goto(s|11)
 exten => sw-19-,10,Goto(sw-19-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-19-ANSWER,10,Goto(s|11)
 exten => sw-19-BUSY,10,Voicemail(b${ext})
-exten => sw-19-BUSY,11,Goto(s|10)
+exten => sw-19-BUSY,11,Goto(s|11)
 exten => sw-19-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-19-DONTCALL,11,Goto(s|10)
+exten => sw-19-DONTCALL,11,Goto(s|11)
 exten => sw-19-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-19-TORTURE,11,Goto(s|10)
+exten => sw-19-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_18]
@@ -461,20 +479,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_18-20)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-20-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_18-20)
 exten => _sw-20-.,10,Voicemail(u${ext})
-exten => _sw-20-.,11,Goto(s|10)
+exten => _sw-20-.,11,Goto(s|11)
 exten => sw-20-,10,Goto(sw-20-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-20-ANSWER,10,Goto(s|11)
 exten => sw-20-BUSY,10,Voicemail(b${ext})
-exten => sw-20-BUSY,11,Goto(s|10)
+exten => sw-20-BUSY,11,Goto(s|11)
 exten => sw-20-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-20-DONTCALL,11,Goto(s|10)
+exten => sw-20-DONTCALL,11,Goto(s|11)
 exten => sw-20-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-20-TORTURE,11,Goto(s|10)
+exten => sw-20-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_19]
@@ -486,20 +505,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_19-21)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-21-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_19-21)
 exten => _sw-21-.,10,Voicemail(u${ext})
-exten => _sw-21-.,11,Goto(s|10)
+exten => _sw-21-.,11,Goto(s|11)
 exten => sw-21-,10,Goto(sw-21-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-21-ANSWER,10,Goto(s|11)
 exten => sw-21-BUSY,10,Voicemail(b${ext})
-exten => sw-21-BUSY,11,Goto(s|10)
+exten => sw-21-BUSY,11,Goto(s|11)
 exten => sw-21-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-21-DONTCALL,11,Goto(s|10)
+exten => sw-21-DONTCALL,11,Goto(s|11)
 exten => sw-21-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-21-TORTURE,11,Goto(s|10)
+exten => sw-21-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_20]
@@ -511,20 +531,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_20-22)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-22-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_20-22)
 exten => _sw-22-.,10,Voicemail(u${ext})
-exten => _sw-22-.,11,Goto(s|10)
+exten => _sw-22-.,11,Goto(s|11)
 exten => sw-22-,10,Goto(sw-22-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-22-ANSWER,10,Goto(s|11)
 exten => sw-22-BUSY,10,Voicemail(b${ext})
-exten => sw-22-BUSY,11,Goto(s|10)
+exten => sw-22-BUSY,11,Goto(s|11)
 exten => sw-22-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-22-DONTCALL,11,Goto(s|10)
+exten => sw-22-DONTCALL,11,Goto(s|11)
 exten => sw-22-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-22-TORTURE,11,Goto(s|10)
+exten => sw-22-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_21]
@@ -536,20 +557,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_21-23)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-23-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_21-23)
 exten => _sw-23-.,10,Voicemail(u${ext})
-exten => _sw-23-.,11,Goto(s|10)
+exten => _sw-23-.,11,Goto(s|11)
 exten => sw-23-,10,Goto(sw-23-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-23-ANSWER,10,Goto(s|11)
 exten => sw-23-BUSY,10,Voicemail(b${ext})
-exten => sw-23-BUSY,11,Goto(s|10)
+exten => sw-23-BUSY,11,Goto(s|11)
 exten => sw-23-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-23-DONTCALL,11,Goto(s|10)
+exten => sw-23-DONTCALL,11,Goto(s|11)
 exten => sw-23-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-23-TORTURE,11,Goto(s|10)
+exten => sw-23-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_22]
@@ -561,20 +583,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_22-24)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-24-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_22-24)
 exten => _sw-24-.,10,Voicemail(u${ext})
-exten => _sw-24-.,11,Goto(s|10)
+exten => _sw-24-.,11,Goto(s|11)
 exten => sw-24-,10,Goto(sw-24-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-24-ANSWER,10,Goto(s|11)
 exten => sw-24-BUSY,10,Voicemail(b${ext})
-exten => sw-24-BUSY,11,Goto(s|10)
+exten => sw-24-BUSY,11,Goto(s|11)
 exten => sw-24-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-24-DONTCALL,11,Goto(s|10)
+exten => sw-24-DONTCALL,11,Goto(s|11)
 exten => sw-24-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-24-TORTURE,11,Goto(s|10)
+exten => sw-24-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_23]
@@ -586,20 +609,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_23-25)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-25-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_23-25)
 exten => _sw-25-.,10,Voicemail(u${ext})
-exten => _sw-25-.,11,Goto(s|10)
+exten => _sw-25-.,11,Goto(s|11)
 exten => sw-25-,10,Goto(sw-25-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-25-ANSWER,10,Goto(s|11)
 exten => sw-25-BUSY,10,Voicemail(b${ext})
-exten => sw-25-BUSY,11,Goto(s|10)
+exten => sw-25-BUSY,11,Goto(s|11)
 exten => sw-25-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-25-DONTCALL,11,Goto(s|10)
+exten => sw-25-DONTCALL,11,Goto(s|11)
 exten => sw-25-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-25-TORTURE,11,Goto(s|10)
+exten => sw-25-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_24]
@@ -611,20 +635,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_24-26)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-26-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_24-26)
 exten => _sw-26-.,10,Voicemail(u${ext})
-exten => _sw-26-.,11,Goto(s|10)
+exten => _sw-26-.,11,Goto(s|11)
 exten => sw-26-,10,Goto(sw-26-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-26-ANSWER,10,Goto(s|11)
 exten => sw-26-BUSY,10,Voicemail(b${ext})
-exten => sw-26-BUSY,11,Goto(s|10)
+exten => sw-26-BUSY,11,Goto(s|11)
 exten => sw-26-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-26-DONTCALL,11,Goto(s|10)
+exten => sw-26-DONTCALL,11,Goto(s|11)
 exten => sw-26-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-26-TORTURE,11,Goto(s|10)
+exten => sw-26-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_25]
@@ -636,20 +661,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_25-27)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-27-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_25-27)
 exten => _sw-27-.,10,Voicemail(u${ext})
-exten => _sw-27-.,11,Goto(s|10)
+exten => _sw-27-.,11,Goto(s|11)
 exten => sw-27-,10,Goto(sw-27-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-27-ANSWER,10,Goto(s|11)
 exten => sw-27-BUSY,10,Voicemail(b${ext})
-exten => sw-27-BUSY,11,Goto(s|10)
+exten => sw-27-BUSY,11,Goto(s|11)
 exten => sw-27-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-27-DONTCALL,11,Goto(s|10)
+exten => sw-27-DONTCALL,11,Goto(s|11)
 exten => sw-27-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-27-TORTURE,11,Goto(s|10)
+exten => sw-27-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_26]
@@ -661,20 +687,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_26-28)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-28-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_26-28)
 exten => _sw-28-.,10,Voicemail(u${ext})
-exten => _sw-28-.,11,Goto(s|10)
+exten => _sw-28-.,11,Goto(s|11)
 exten => sw-28-,10,Goto(sw-28-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-28-ANSWER,10,Goto(s|11)
 exten => sw-28-BUSY,10,Voicemail(b${ext})
-exten => sw-28-BUSY,11,Goto(s|10)
+exten => sw-28-BUSY,11,Goto(s|11)
 exten => sw-28-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-28-DONTCALL,11,Goto(s|10)
+exten => sw-28-DONTCALL,11,Goto(s|11)
 exten => sw-28-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-28-TORTURE,11,Goto(s|10)
+exten => sw-28-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_27]
@@ -686,20 +713,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_27-29)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-29-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_27-29)
 exten => _sw-29-.,10,Voicemail(u${ext})
-exten => _sw-29-.,11,Goto(s|10)
+exten => _sw-29-.,11,Goto(s|11)
 exten => sw-29-,10,Goto(sw-29-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-29-ANSWER,10,Goto(s|11)
 exten => sw-29-BUSY,10,Voicemail(b${ext})
-exten => sw-29-BUSY,11,Goto(s|10)
+exten => sw-29-BUSY,11,Goto(s|11)
 exten => sw-29-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-29-DONTCALL,11,Goto(s|10)
+exten => sw-29-DONTCALL,11,Goto(s|11)
 exten => sw-29-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-29-TORTURE,11,Goto(s|10)
+exten => sw-29-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_28]
@@ -711,20 +739,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_28-30)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-30-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_28-30)
 exten => _sw-30-.,10,Voicemail(u${ext})
-exten => _sw-30-.,11,Goto(s|10)
+exten => _sw-30-.,11,Goto(s|11)
 exten => sw-30-,10,Goto(sw-30-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-30-ANSWER,10,Goto(s|11)
 exten => sw-30-BUSY,10,Voicemail(b${ext})
-exten => sw-30-BUSY,11,Goto(s|10)
+exten => sw-30-BUSY,11,Goto(s|11)
 exten => sw-30-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-30-DONTCALL,11,Goto(s|10)
+exten => sw-30-DONTCALL,11,Goto(s|11)
 exten => sw-30-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-30-TORTURE,11,Goto(s|10)
+exten => sw-30-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_29]
@@ -736,20 +765,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_29-31)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-31-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_29-31)
 exten => _sw-31-.,10,Voicemail(u${ext})
-exten => _sw-31-.,11,Goto(s|10)
+exten => _sw-31-.,11,Goto(s|11)
 exten => sw-31-,10,Goto(sw-31-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-31-ANSWER,10,Goto(s|11)
 exten => sw-31-BUSY,10,Voicemail(b${ext})
-exten => sw-31-BUSY,11,Goto(s|10)
+exten => sw-31-BUSY,11,Goto(s|11)
 exten => sw-31-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-31-DONTCALL,11,Goto(s|10)
+exten => sw-31-DONTCALL,11,Goto(s|11)
 exten => sw-31-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-31-TORTURE,11,Goto(s|10)
+exten => sw-31-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_30]
@@ -761,20 +791,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_30-32)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-32-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_30-32)
 exten => _sw-32-.,10,Voicemail(u${ext})
-exten => _sw-32-.,11,Goto(s|10)
+exten => _sw-32-.,11,Goto(s|11)
 exten => sw-32-,10,Goto(sw-32-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-32-ANSWER,10,Goto(s|11)
 exten => sw-32-BUSY,10,Voicemail(b${ext})
-exten => sw-32-BUSY,11,Goto(s|10)
+exten => sw-32-BUSY,11,Goto(s|11)
 exten => sw-32-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-32-DONTCALL,11,Goto(s|10)
+exten => sw-32-DONTCALL,11,Goto(s|11)
 exten => sw-32-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-32-TORTURE,11,Goto(s|10)
+exten => sw-32-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_31]
@@ -786,20 +817,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_31-33)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-33-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_31-33)
 exten => _sw-33-.,10,Voicemail(u${ext})
-exten => _sw-33-.,11,Goto(s|10)
+exten => _sw-33-.,11,Goto(s|11)
 exten => sw-33-,10,Goto(sw-33-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-33-ANSWER,10,Goto(s|11)
 exten => sw-33-BUSY,10,Voicemail(b${ext})
-exten => sw-33-BUSY,11,Goto(s|10)
+exten => sw-33-BUSY,11,Goto(s|11)
 exten => sw-33-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-33-DONTCALL,11,Goto(s|10)
+exten => sw-33-DONTCALL,11,Goto(s|11)
 exten => sw-33-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-33-TORTURE,11,Goto(s|10)
+exten => sw-33-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_32]
@@ -811,20 +843,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_32-34)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-34-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_32-34)
 exten => _sw-34-.,10,Voicemail(u${ext})
-exten => _sw-34-.,11,Goto(s|10)
+exten => _sw-34-.,11,Goto(s|11)
 exten => sw-34-,10,Goto(sw-34-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-34-ANSWER,10,Goto(s|11)
 exten => sw-34-BUSY,10,Voicemail(b${ext})
-exten => sw-34-BUSY,11,Goto(s|10)
+exten => sw-34-BUSY,11,Goto(s|11)
 exten => sw-34-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-34-DONTCALL,11,Goto(s|10)
+exten => sw-34-DONTCALL,11,Goto(s|11)
 exten => sw-34-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-34-TORTURE,11,Goto(s|10)
+exten => sw-34-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_33]
@@ -836,20 +869,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_33-35)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-35-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_33-35)
 exten => _sw-35-.,10,Voicemail(u${ext})
-exten => _sw-35-.,11,Goto(s|10)
+exten => _sw-35-.,11,Goto(s|11)
 exten => sw-35-,10,Goto(sw-35-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-35-ANSWER,10,Goto(s|11)
 exten => sw-35-BUSY,10,Voicemail(b${ext})
-exten => sw-35-BUSY,11,Goto(s|10)
+exten => sw-35-BUSY,11,Goto(s|11)
 exten => sw-35-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-35-DONTCALL,11,Goto(s|10)
+exten => sw-35-DONTCALL,11,Goto(s|11)
 exten => sw-35-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-35-TORTURE,11,Goto(s|10)
+exten => sw-35-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_34]
@@ -861,20 +895,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_34-36)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-36-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_34-36)
 exten => _sw-36-.,10,Voicemail(u${ext})
-exten => _sw-36-.,11,Goto(s|10)
+exten => _sw-36-.,11,Goto(s|11)
 exten => sw-36-,10,Goto(sw-36-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-36-ANSWER,10,Goto(s|11)
 exten => sw-36-BUSY,10,Voicemail(b${ext})
-exten => sw-36-BUSY,11,Goto(s|10)
+exten => sw-36-BUSY,11,Goto(s|11)
 exten => sw-36-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-36-DONTCALL,11,Goto(s|10)
+exten => sw-36-DONTCALL,11,Goto(s|11)
 exten => sw-36-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-36-TORTURE,11,Goto(s|10)
+exten => sw-36-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_35]
@@ -886,20 +921,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_35-37)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-37-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_35-37)
 exten => _sw-37-.,10,Voicemail(u${ext})
-exten => _sw-37-.,11,Goto(s|10)
+exten => _sw-37-.,11,Goto(s|11)
 exten => sw-37-,10,Goto(sw-37-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-37-ANSWER,10,Goto(s|11)
 exten => sw-37-BUSY,10,Voicemail(b${ext})
-exten => sw-37-BUSY,11,Goto(s|10)
+exten => sw-37-BUSY,11,Goto(s|11)
 exten => sw-37-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-37-DONTCALL,11,Goto(s|10)
+exten => sw-37-DONTCALL,11,Goto(s|11)
 exten => sw-37-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-37-TORTURE,11,Goto(s|10)
+exten => sw-37-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_36]
@@ -911,20 +947,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_36-38)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-38-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_36-38)
 exten => _sw-38-.,10,Voicemail(u${ext})
-exten => _sw-38-.,11,Goto(s|10)
+exten => _sw-38-.,11,Goto(s|11)
 exten => sw-38-,10,Goto(sw-38-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-38-ANSWER,10,Goto(s|11)
 exten => sw-38-BUSY,10,Voicemail(b${ext})
-exten => sw-38-BUSY,11,Goto(s|10)
+exten => sw-38-BUSY,11,Goto(s|11)
 exten => sw-38-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-38-DONTCALL,11,Goto(s|10)
+exten => sw-38-DONTCALL,11,Goto(s|11)
 exten => sw-38-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-38-TORTURE,11,Goto(s|10)
+exten => sw-38-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_37]
@@ -936,20 +973,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_37-39)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-39-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_37-39)
 exten => _sw-39-.,10,Voicemail(u${ext})
-exten => _sw-39-.,11,Goto(s|10)
+exten => _sw-39-.,11,Goto(s|11)
 exten => sw-39-,10,Goto(sw-39-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-39-ANSWER,10,Goto(s|11)
 exten => sw-39-BUSY,10,Voicemail(b${ext})
-exten => sw-39-BUSY,11,Goto(s|10)
+exten => sw-39-BUSY,11,Goto(s|11)
 exten => sw-39-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-39-DONTCALL,11,Goto(s|10)
+exten => sw-39-DONTCALL,11,Goto(s|11)
 exten => sw-39-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-39-TORTURE,11,Goto(s|10)
+exten => sw-39-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_38]
@@ -961,20 +999,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_38-40)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-40-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_38-40)
 exten => _sw-40-.,10,Voicemail(u${ext})
-exten => _sw-40-.,11,Goto(s|10)
+exten => _sw-40-.,11,Goto(s|11)
 exten => sw-40-,10,Goto(sw-40-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-40-ANSWER,10,Goto(s|11)
 exten => sw-40-BUSY,10,Voicemail(b${ext})
-exten => sw-40-BUSY,11,Goto(s|10)
+exten => sw-40-BUSY,11,Goto(s|11)
 exten => sw-40-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-40-DONTCALL,11,Goto(s|10)
+exten => sw-40-DONTCALL,11,Goto(s|11)
 exten => sw-40-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-40-TORTURE,11,Goto(s|10)
+exten => sw-40-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_39]
@@ -986,20 +1025,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_39-41)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-41-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_39-41)
 exten => _sw-41-.,10,Voicemail(u${ext})
-exten => _sw-41-.,11,Goto(s|10)
+exten => _sw-41-.,11,Goto(s|11)
 exten => sw-41-,10,Goto(sw-41-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-41-ANSWER,10,Goto(s|11)
 exten => sw-41-BUSY,10,Voicemail(b${ext})
-exten => sw-41-BUSY,11,Goto(s|10)
+exten => sw-41-BUSY,11,Goto(s|11)
 exten => sw-41-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-41-DONTCALL,11,Goto(s|10)
+exten => sw-41-DONTCALL,11,Goto(s|11)
 exten => sw-41-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-41-TORTURE,11,Goto(s|10)
+exten => sw-41-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_40]
@@ -1011,20 +1051,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_40-42)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-42-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_40-42)
 exten => _sw-42-.,10,Voicemail(u${ext})
-exten => _sw-42-.,11,Goto(s|10)
+exten => _sw-42-.,11,Goto(s|11)
 exten => sw-42-,10,Goto(sw-42-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-42-ANSWER,10,Goto(s|11)
 exten => sw-42-BUSY,10,Voicemail(b${ext})
-exten => sw-42-BUSY,11,Goto(s|10)
+exten => sw-42-BUSY,11,Goto(s|11)
 exten => sw-42-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-42-DONTCALL,11,Goto(s|10)
+exten => sw-42-DONTCALL,11,Goto(s|11)
 exten => sw-42-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-42-TORTURE,11,Goto(s|10)
+exten => sw-42-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_41]
@@ -1036,20 +1077,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_41-43)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-43-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_41-43)
 exten => _sw-43-.,10,Voicemail(u${ext})
-exten => _sw-43-.,11,Goto(s|10)
+exten => _sw-43-.,11,Goto(s|11)
 exten => sw-43-,10,Goto(sw-43-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-43-ANSWER,10,Goto(s|11)
 exten => sw-43-BUSY,10,Voicemail(b${ext})
-exten => sw-43-BUSY,11,Goto(s|10)
+exten => sw-43-BUSY,11,Goto(s|11)
 exten => sw-43-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-43-DONTCALL,11,Goto(s|10)
+exten => sw-43-DONTCALL,11,Goto(s|11)
 exten => sw-43-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-43-TORTURE,11,Goto(s|10)
+exten => sw-43-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_42]
@@ -1061,20 +1103,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_42-44)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-44-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_42-44)
 exten => _sw-44-.,10,Voicemail(u${ext})
-exten => _sw-44-.,11,Goto(s|10)
+exten => _sw-44-.,11,Goto(s|11)
 exten => sw-44-,10,Goto(sw-44-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-44-ANSWER,10,Goto(s|11)
 exten => sw-44-BUSY,10,Voicemail(b${ext})
-exten => sw-44-BUSY,11,Goto(s|10)
+exten => sw-44-BUSY,11,Goto(s|11)
 exten => sw-44-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-44-DONTCALL,11,Goto(s|10)
+exten => sw-44-DONTCALL,11,Goto(s|11)
 exten => sw-44-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-44-TORTURE,11,Goto(s|10)
+exten => sw-44-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_43]
@@ -1086,20 +1129,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_43-45)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-45-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_43-45)
 exten => _sw-45-.,10,Voicemail(u${ext})
-exten => _sw-45-.,11,Goto(s|10)
+exten => _sw-45-.,11,Goto(s|11)
 exten => sw-45-,10,Goto(sw-45-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-45-ANSWER,10,Goto(s|11)
 exten => sw-45-BUSY,10,Voicemail(b${ext})
-exten => sw-45-BUSY,11,Goto(s|10)
+exten => sw-45-BUSY,11,Goto(s|11)
 exten => sw-45-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-45-DONTCALL,11,Goto(s|10)
+exten => sw-45-DONTCALL,11,Goto(s|11)
 exten => sw-45-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-45-TORTURE,11,Goto(s|10)
+exten => sw-45-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_44]
@@ -1111,20 +1155,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_44-46)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-46-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_44-46)
 exten => _sw-46-.,10,Voicemail(u${ext})
-exten => _sw-46-.,11,Goto(s|10)
+exten => _sw-46-.,11,Goto(s|11)
 exten => sw-46-,10,Goto(sw-46-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-46-ANSWER,10,Goto(s|11)
 exten => sw-46-BUSY,10,Voicemail(b${ext})
-exten => sw-46-BUSY,11,Goto(s|10)
+exten => sw-46-BUSY,11,Goto(s|11)
 exten => sw-46-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-46-DONTCALL,11,Goto(s|10)
+exten => sw-46-DONTCALL,11,Goto(s|11)
 exten => sw-46-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-46-TORTURE,11,Goto(s|10)
+exten => sw-46-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_45]
@@ -1136,20 +1181,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_45-47)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-47-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_45-47)
 exten => _sw-47-.,10,Voicemail(u${ext})
-exten => _sw-47-.,11,Goto(s|10)
+exten => _sw-47-.,11,Goto(s|11)
 exten => sw-47-,10,Goto(sw-47-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-47-ANSWER,10,Goto(s|11)
 exten => sw-47-BUSY,10,Voicemail(b${ext})
-exten => sw-47-BUSY,11,Goto(s|10)
+exten => sw-47-BUSY,11,Goto(s|11)
 exten => sw-47-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-47-DONTCALL,11,Goto(s|10)
+exten => sw-47-DONTCALL,11,Goto(s|11)
 exten => sw-47-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-47-TORTURE,11,Goto(s|10)
+exten => sw-47-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_46]
@@ -1161,20 +1207,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_46-48)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-48-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_46-48)
 exten => _sw-48-.,10,Voicemail(u${ext})
-exten => _sw-48-.,11,Goto(s|10)
+exten => _sw-48-.,11,Goto(s|11)
 exten => sw-48-,10,Goto(sw-48-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-48-ANSWER,10,Goto(s|11)
 exten => sw-48-BUSY,10,Voicemail(b${ext})
-exten => sw-48-BUSY,11,Goto(s|10)
+exten => sw-48-BUSY,11,Goto(s|11)
 exten => sw-48-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-48-DONTCALL,11,Goto(s|10)
+exten => sw-48-DONTCALL,11,Goto(s|11)
 exten => sw-48-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-48-TORTURE,11,Goto(s|10)
+exten => sw-48-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_47]
@@ -1186,20 +1233,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_47-49)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-49-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_47-49)
 exten => _sw-49-.,10,Voicemail(u${ext})
-exten => _sw-49-.,11,Goto(s|10)
+exten => _sw-49-.,11,Goto(s|11)
 exten => sw-49-,10,Goto(sw-49-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-49-ANSWER,10,Goto(s|11)
 exten => sw-49-BUSY,10,Voicemail(b${ext})
-exten => sw-49-BUSY,11,Goto(s|10)
+exten => sw-49-BUSY,11,Goto(s|11)
 exten => sw-49-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-49-DONTCALL,11,Goto(s|10)
+exten => sw-49-DONTCALL,11,Goto(s|11)
 exten => sw-49-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-49-TORTURE,11,Goto(s|10)
+exten => sw-49-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_48]
@@ -1211,20 +1259,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_48-50)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-50-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_48-50)
 exten => _sw-50-.,10,Voicemail(u${ext})
-exten => _sw-50-.,11,Goto(s|10)
+exten => _sw-50-.,11,Goto(s|11)
 exten => sw-50-,10,Goto(sw-50-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-50-ANSWER,10,Goto(s|11)
 exten => sw-50-BUSY,10,Voicemail(b${ext})
-exten => sw-50-BUSY,11,Goto(s|10)
+exten => sw-50-BUSY,11,Goto(s|11)
 exten => sw-50-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-50-DONTCALL,11,Goto(s|10)
+exten => sw-50-DONTCALL,11,Goto(s|11)
 exten => sw-50-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-50-TORTURE,11,Goto(s|10)
+exten => sw-50-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_49]
@@ -1236,20 +1285,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_49-51)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-51-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_49-51)
 exten => _sw-51-.,10,Voicemail(u${ext})
-exten => _sw-51-.,11,Goto(s|10)
+exten => _sw-51-.,11,Goto(s|11)
 exten => sw-51-,10,Goto(sw-51-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-51-ANSWER,10,Goto(s|11)
 exten => sw-51-BUSY,10,Voicemail(b${ext})
-exten => sw-51-BUSY,11,Goto(s|10)
+exten => sw-51-BUSY,11,Goto(s|11)
 exten => sw-51-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-51-DONTCALL,11,Goto(s|10)
+exten => sw-51-DONTCALL,11,Goto(s|11)
 exten => sw-51-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-51-TORTURE,11,Goto(s|10)
+exten => sw-51-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_50]
@@ -1261,20 +1311,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_50-52)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-52-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_50-52)
 exten => _sw-52-.,10,Voicemail(u${ext})
-exten => _sw-52-.,11,Goto(s|10)
+exten => _sw-52-.,11,Goto(s|11)
 exten => sw-52-,10,Goto(sw-52-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-52-ANSWER,10,Goto(s|11)
 exten => sw-52-BUSY,10,Voicemail(b${ext})
-exten => sw-52-BUSY,11,Goto(s|10)
+exten => sw-52-BUSY,11,Goto(s|11)
 exten => sw-52-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-52-DONTCALL,11,Goto(s|10)
+exten => sw-52-DONTCALL,11,Goto(s|11)
 exten => sw-52-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-52-TORTURE,11,Goto(s|10)
+exten => sw-52-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_51]
@@ -1286,20 +1337,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_51-53)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-53-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_51-53)
 exten => _sw-53-.,10,Voicemail(u${ext})
-exten => _sw-53-.,11,Goto(s|10)
+exten => _sw-53-.,11,Goto(s|11)
 exten => sw-53-,10,Goto(sw-53-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-53-ANSWER,10,Goto(s|11)
 exten => sw-53-BUSY,10,Voicemail(b${ext})
-exten => sw-53-BUSY,11,Goto(s|10)
+exten => sw-53-BUSY,11,Goto(s|11)
 exten => sw-53-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-53-DONTCALL,11,Goto(s|10)
+exten => sw-53-DONTCALL,11,Goto(s|11)
 exten => sw-53-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-53-TORTURE,11,Goto(s|10)
+exten => sw-53-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_52]
@@ -1311,20 +1363,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_52-54)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-54-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_52-54)
 exten => _sw-54-.,10,Voicemail(u${ext})
-exten => _sw-54-.,11,Goto(s|10)
+exten => _sw-54-.,11,Goto(s|11)
 exten => sw-54-,10,Goto(sw-54-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-54-ANSWER,10,Goto(s|11)
 exten => sw-54-BUSY,10,Voicemail(b${ext})
-exten => sw-54-BUSY,11,Goto(s|10)
+exten => sw-54-BUSY,11,Goto(s|11)
 exten => sw-54-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-54-DONTCALL,11,Goto(s|10)
+exten => sw-54-DONTCALL,11,Goto(s|11)
 exten => sw-54-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-54-TORTURE,11,Goto(s|10)
+exten => sw-54-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_53]
@@ -1336,20 +1389,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_53-55)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-55-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_53-55)
 exten => _sw-55-.,10,Voicemail(u${ext})
-exten => _sw-55-.,11,Goto(s|10)
+exten => _sw-55-.,11,Goto(s|11)
 exten => sw-55-,10,Goto(sw-55-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-55-ANSWER,10,Goto(s|11)
 exten => sw-55-BUSY,10,Voicemail(b${ext})
-exten => sw-55-BUSY,11,Goto(s|10)
+exten => sw-55-BUSY,11,Goto(s|11)
 exten => sw-55-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-55-DONTCALL,11,Goto(s|10)
+exten => sw-55-DONTCALL,11,Goto(s|11)
 exten => sw-55-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-55-TORTURE,11,Goto(s|10)
+exten => sw-55-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_54]
@@ -1361,20 +1415,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_54-56)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-56-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_54-56)
 exten => _sw-56-.,10,Voicemail(u${ext})
-exten => _sw-56-.,11,Goto(s|10)
+exten => _sw-56-.,11,Goto(s|11)
 exten => sw-56-,10,Goto(sw-56-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-56-ANSWER,10,Goto(s|11)
 exten => sw-56-BUSY,10,Voicemail(b${ext})
-exten => sw-56-BUSY,11,Goto(s|10)
+exten => sw-56-BUSY,11,Goto(s|11)
 exten => sw-56-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-56-DONTCALL,11,Goto(s|10)
+exten => sw-56-DONTCALL,11,Goto(s|11)
 exten => sw-56-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-56-TORTURE,11,Goto(s|10)
+exten => sw-56-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_55]
@@ -1386,20 +1441,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_55-57)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-57-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_55-57)
 exten => _sw-57-.,10,Voicemail(u${ext})
-exten => _sw-57-.,11,Goto(s|10)
+exten => _sw-57-.,11,Goto(s|11)
 exten => sw-57-,10,Goto(sw-57-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-57-ANSWER,10,Goto(s|11)
 exten => sw-57-BUSY,10,Voicemail(b${ext})
-exten => sw-57-BUSY,11,Goto(s|10)
+exten => sw-57-BUSY,11,Goto(s|11)
 exten => sw-57-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-57-DONTCALL,11,Goto(s|10)
+exten => sw-57-DONTCALL,11,Goto(s|11)
 exten => sw-57-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-57-TORTURE,11,Goto(s|10)
+exten => sw-57-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_56]
@@ -1411,20 +1467,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_56-58)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-58-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_56-58)
 exten => _sw-58-.,10,Voicemail(u${ext})
-exten => _sw-58-.,11,Goto(s|10)
+exten => _sw-58-.,11,Goto(s|11)
 exten => sw-58-,10,Goto(sw-58-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-58-ANSWER,10,Goto(s|11)
 exten => sw-58-BUSY,10,Voicemail(b${ext})
-exten => sw-58-BUSY,11,Goto(s|10)
+exten => sw-58-BUSY,11,Goto(s|11)
 exten => sw-58-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-58-DONTCALL,11,Goto(s|10)
+exten => sw-58-DONTCALL,11,Goto(s|11)
 exten => sw-58-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-58-TORTURE,11,Goto(s|10)
+exten => sw-58-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_57]
@@ -1436,20 +1493,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_57-59)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-59-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_57-59)
 exten => _sw-59-.,10,Voicemail(u${ext})
-exten => _sw-59-.,11,Goto(s|10)
+exten => _sw-59-.,11,Goto(s|11)
 exten => sw-59-,10,Goto(sw-59-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-59-ANSWER,10,Goto(s|11)
 exten => sw-59-BUSY,10,Voicemail(b${ext})
-exten => sw-59-BUSY,11,Goto(s|10)
+exten => sw-59-BUSY,11,Goto(s|11)
 exten => sw-59-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-59-DONTCALL,11,Goto(s|10)
+exten => sw-59-DONTCALL,11,Goto(s|11)
 exten => sw-59-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-59-TORTURE,11,Goto(s|10)
+exten => sw-59-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_58]
@@ -1461,20 +1519,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_58-60)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-60-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_58-60)
 exten => _sw-60-.,10,Voicemail(u${ext})
-exten => _sw-60-.,11,Goto(s|10)
+exten => _sw-60-.,11,Goto(s|11)
 exten => sw-60-,10,Goto(sw-60-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-60-ANSWER,10,Goto(s|11)
 exten => sw-60-BUSY,10,Voicemail(b${ext})
-exten => sw-60-BUSY,11,Goto(s|10)
+exten => sw-60-BUSY,11,Goto(s|11)
 exten => sw-60-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-60-DONTCALL,11,Goto(s|10)
+exten => sw-60-DONTCALL,11,Goto(s|11)
 exten => sw-60-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-60-TORTURE,11,Goto(s|10)
+exten => sw-60-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_59]
@@ -1486,20 +1545,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_59-61)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-61-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_59-61)
 exten => _sw-61-.,10,Voicemail(u${ext})
-exten => _sw-61-.,11,Goto(s|10)
+exten => _sw-61-.,11,Goto(s|11)
 exten => sw-61-,10,Goto(sw-61-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-61-ANSWER,10,Goto(s|11)
 exten => sw-61-BUSY,10,Voicemail(b${ext})
-exten => sw-61-BUSY,11,Goto(s|10)
+exten => sw-61-BUSY,11,Goto(s|11)
 exten => sw-61-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-61-DONTCALL,11,Goto(s|10)
+exten => sw-61-DONTCALL,11,Goto(s|11)
 exten => sw-61-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-61-TORTURE,11,Goto(s|10)
+exten => sw-61-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_60]
@@ -1511,20 +1571,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_60-62)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-62-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_60-62)
 exten => _sw-62-.,10,Voicemail(u${ext})
-exten => _sw-62-.,11,Goto(s|10)
+exten => _sw-62-.,11,Goto(s|11)
 exten => sw-62-,10,Goto(sw-62-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-62-ANSWER,10,Goto(s|11)
 exten => sw-62-BUSY,10,Voicemail(b${ext})
-exten => sw-62-BUSY,11,Goto(s|10)
+exten => sw-62-BUSY,11,Goto(s|11)
 exten => sw-62-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-62-DONTCALL,11,Goto(s|10)
+exten => sw-62-DONTCALL,11,Goto(s|11)
 exten => sw-62-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-62-TORTURE,11,Goto(s|10)
+exten => sw-62-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_61]
@@ -1536,20 +1597,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_61-63)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-63-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_61-63)
 exten => _sw-63-.,10,Voicemail(u${ext})
-exten => _sw-63-.,11,Goto(s|10)
+exten => _sw-63-.,11,Goto(s|11)
 exten => sw-63-,10,Goto(sw-63-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-63-ANSWER,10,Goto(s|11)
 exten => sw-63-BUSY,10,Voicemail(b${ext})
-exten => sw-63-BUSY,11,Goto(s|10)
+exten => sw-63-BUSY,11,Goto(s|11)
 exten => sw-63-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-63-DONTCALL,11,Goto(s|10)
+exten => sw-63-DONTCALL,11,Goto(s|11)
 exten => sw-63-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-63-TORTURE,11,Goto(s|10)
+exten => sw-63-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_62]
@@ -1561,20 +1623,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_62-64)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-64-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_62-64)
 exten => _sw-64-.,10,Voicemail(u${ext})
-exten => _sw-64-.,11,Goto(s|10)
+exten => _sw-64-.,11,Goto(s|11)
 exten => sw-64-,10,Goto(sw-64-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-64-ANSWER,10,Goto(s|11)
 exten => sw-64-BUSY,10,Voicemail(b${ext})
-exten => sw-64-BUSY,11,Goto(s|10)
+exten => sw-64-BUSY,11,Goto(s|11)
 exten => sw-64-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-64-DONTCALL,11,Goto(s|10)
+exten => sw-64-DONTCALL,11,Goto(s|11)
 exten => sw-64-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-64-TORTURE,11,Goto(s|10)
+exten => sw-64-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_63]
@@ -1586,20 +1649,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_63-65)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-65-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_63-65)
 exten => _sw-65-.,10,Voicemail(u${ext})
-exten => _sw-65-.,11,Goto(s|10)
+exten => _sw-65-.,11,Goto(s|11)
 exten => sw-65-,10,Goto(sw-65-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-65-ANSWER,10,Goto(s|11)
 exten => sw-65-BUSY,10,Voicemail(b${ext})
-exten => sw-65-BUSY,11,Goto(s|10)
+exten => sw-65-BUSY,11,Goto(s|11)
 exten => sw-65-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-65-DONTCALL,11,Goto(s|10)
+exten => sw-65-DONTCALL,11,Goto(s|11)
 exten => sw-65-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-65-TORTURE,11,Goto(s|10)
+exten => sw-65-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_64]
@@ -1611,20 +1675,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_64-66)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-66-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_64-66)
 exten => _sw-66-.,10,Voicemail(u${ext})
-exten => _sw-66-.,11,Goto(s|10)
+exten => _sw-66-.,11,Goto(s|11)
 exten => sw-66-,10,Goto(sw-66-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-66-ANSWER,10,Goto(s|11)
 exten => sw-66-BUSY,10,Voicemail(b${ext})
-exten => sw-66-BUSY,11,Goto(s|10)
+exten => sw-66-BUSY,11,Goto(s|11)
 exten => sw-66-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-66-DONTCALL,11,Goto(s|10)
+exten => sw-66-DONTCALL,11,Goto(s|11)
 exten => sw-66-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-66-TORTURE,11,Goto(s|10)
+exten => sw-66-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_65]
@@ -1636,20 +1701,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_65-67)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-67-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_65-67)
 exten => _sw-67-.,10,Voicemail(u${ext})
-exten => _sw-67-.,11,Goto(s|10)
+exten => _sw-67-.,11,Goto(s|11)
 exten => sw-67-,10,Goto(sw-67-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-67-ANSWER,10,Goto(s|11)
 exten => sw-67-BUSY,10,Voicemail(b${ext})
-exten => sw-67-BUSY,11,Goto(s|10)
+exten => sw-67-BUSY,11,Goto(s|11)
 exten => sw-67-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-67-DONTCALL,11,Goto(s|10)
+exten => sw-67-DONTCALL,11,Goto(s|11)
 exten => sw-67-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-67-TORTURE,11,Goto(s|10)
+exten => sw-67-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_66]
@@ -1661,20 +1727,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_66-68)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-68-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_66-68)
 exten => _sw-68-.,10,Voicemail(u${ext})
-exten => _sw-68-.,11,Goto(s|10)
+exten => _sw-68-.,11,Goto(s|11)
 exten => sw-68-,10,Goto(sw-68-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-68-ANSWER,10,Goto(s|11)
 exten => sw-68-BUSY,10,Voicemail(b${ext})
-exten => sw-68-BUSY,11,Goto(s|10)
+exten => sw-68-BUSY,11,Goto(s|11)
 exten => sw-68-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-68-DONTCALL,11,Goto(s|10)
+exten => sw-68-DONTCALL,11,Goto(s|11)
 exten => sw-68-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-68-TORTURE,11,Goto(s|10)
+exten => sw-68-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_67]
@@ -1686,20 +1753,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_67-69)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-69-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_67-69)
 exten => _sw-69-.,10,Voicemail(u${ext})
-exten => _sw-69-.,11,Goto(s|10)
+exten => _sw-69-.,11,Goto(s|11)
 exten => sw-69-,10,Goto(sw-69-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-69-ANSWER,10,Goto(s|11)
 exten => sw-69-BUSY,10,Voicemail(b${ext})
-exten => sw-69-BUSY,11,Goto(s|10)
+exten => sw-69-BUSY,11,Goto(s|11)
 exten => sw-69-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-69-DONTCALL,11,Goto(s|10)
+exten => sw-69-DONTCALL,11,Goto(s|11)
 exten => sw-69-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-69-TORTURE,11,Goto(s|10)
+exten => sw-69-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_68]
@@ -1711,20 +1779,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_68-70)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-70-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_68-70)
 exten => _sw-70-.,10,Voicemail(u${ext})
-exten => _sw-70-.,11,Goto(s|10)
+exten => _sw-70-.,11,Goto(s|11)
 exten => sw-70-,10,Goto(sw-70-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-70-ANSWER,10,Goto(s|11)
 exten => sw-70-BUSY,10,Voicemail(b${ext})
-exten => sw-70-BUSY,11,Goto(s|10)
+exten => sw-70-BUSY,11,Goto(s|11)
 exten => sw-70-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-70-DONTCALL,11,Goto(s|10)
+exten => sw-70-DONTCALL,11,Goto(s|11)
 exten => sw-70-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-70-TORTURE,11,Goto(s|10)
+exten => sw-70-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_69]
@@ -1736,20 +1805,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_69-71)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-71-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_69-71)
 exten => _sw-71-.,10,Voicemail(u${ext})
-exten => _sw-71-.,11,Goto(s|10)
+exten => _sw-71-.,11,Goto(s|11)
 exten => sw-71-,10,Goto(sw-71-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-71-ANSWER,10,Goto(s|11)
 exten => sw-71-BUSY,10,Voicemail(b${ext})
-exten => sw-71-BUSY,11,Goto(s|10)
+exten => sw-71-BUSY,11,Goto(s|11)
 exten => sw-71-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-71-DONTCALL,11,Goto(s|10)
+exten => sw-71-DONTCALL,11,Goto(s|11)
 exten => sw-71-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-71-TORTURE,11,Goto(s|10)
+exten => sw-71-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_70]
@@ -1761,20 +1831,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_70-72)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-72-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_70-72)
 exten => _sw-72-.,10,Voicemail(u${ext})
-exten => _sw-72-.,11,Goto(s|10)
+exten => _sw-72-.,11,Goto(s|11)
 exten => sw-72-,10,Goto(sw-72-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-72-ANSWER,10,Goto(s|11)
 exten => sw-72-BUSY,10,Voicemail(b${ext})
-exten => sw-72-BUSY,11,Goto(s|10)
+exten => sw-72-BUSY,11,Goto(s|11)
 exten => sw-72-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-72-DONTCALL,11,Goto(s|10)
+exten => sw-72-DONTCALL,11,Goto(s|11)
 exten => sw-72-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-72-TORTURE,11,Goto(s|10)
+exten => sw-72-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_71]
@@ -1786,20 +1857,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_71-73)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-73-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_71-73)
 exten => _sw-73-.,10,Voicemail(u${ext})
-exten => _sw-73-.,11,Goto(s|10)
+exten => _sw-73-.,11,Goto(s|11)
 exten => sw-73-,10,Goto(sw-73-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-73-ANSWER,10,Goto(s|11)
 exten => sw-73-BUSY,10,Voicemail(b${ext})
-exten => sw-73-BUSY,11,Goto(s|10)
+exten => sw-73-BUSY,11,Goto(s|11)
 exten => sw-73-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-73-DONTCALL,11,Goto(s|10)
+exten => sw-73-DONTCALL,11,Goto(s|11)
 exten => sw-73-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-73-TORTURE,11,Goto(s|10)
+exten => sw-73-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_72]
@@ -1811,20 +1883,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_72-74)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-74-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_72-74)
 exten => _sw-74-.,10,Voicemail(u${ext})
-exten => _sw-74-.,11,Goto(s|10)
+exten => _sw-74-.,11,Goto(s|11)
 exten => sw-74-,10,Goto(sw-74-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-74-ANSWER,10,Goto(s|11)
 exten => sw-74-BUSY,10,Voicemail(b${ext})
-exten => sw-74-BUSY,11,Goto(s|10)
+exten => sw-74-BUSY,11,Goto(s|11)
 exten => sw-74-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-74-DONTCALL,11,Goto(s|10)
+exten => sw-74-DONTCALL,11,Goto(s|11)
 exten => sw-74-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-74-TORTURE,11,Goto(s|10)
+exten => sw-74-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten_73]
@@ -1836,20 +1909,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten_73-75)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-75-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten_73-75)
 exten => _sw-75-.,10,Voicemail(u${ext})
-exten => _sw-75-.,11,Goto(s|10)
+exten => _sw-75-.,11,Goto(s|11)
 exten => sw-75-,10,Goto(sw-75-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-75-ANSWER,10,Goto(s|11)
 exten => sw-75-BUSY,10,Voicemail(b${ext})
-exten => sw-75-BUSY,11,Goto(s|10)
+exten => sw-75-BUSY,11,Goto(s|11)
 exten => sw-75-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-75-DONTCALL,11,Goto(s|10)
+exten => sw-75-DONTCALL,11,Goto(s|11)
 exten => sw-75-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-75-TORTURE,11,Goto(s|10)
+exten => sw-75-TORTURE,11,Goto(s|11)
 
 
 [macro-std-priv-exten]
@@ -1861,20 +1935,21 @@ 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}|10)
-exten => s,10,NoOp(Finish switch-std-priv-exten-76)
+exten => s,9,Set(~~EXTEN~~=${EXTEN})
+exten => s,10,Goto(sw-76-${DIALSTATUS}|10)
+exten => s,11,NoOp(Finish switch-std-priv-exten-76)
 exten => _sw-76-.,10,Voicemail(u${ext})
-exten => _sw-76-.,11,Goto(s|10)
+exten => _sw-76-.,11,Goto(s|11)
 exten => sw-76-,10,Goto(sw-76-.|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-NOANSWER,11,Goto(s|11)
+exten => sw-76-ANSWER,10,Goto(s|11)
 exten => sw-76-BUSY,10,Voicemail(b${ext})
-exten => sw-76-BUSY,11,Goto(s|10)
+exten => sw-76-BUSY,11,Goto(s|11)
 exten => sw-76-DONTCALL,10,Goto(${dontcont}|s|begin)
-exten => sw-76-DONTCALL,11,Goto(s|10)
+exten => sw-76-DONTCALL,11,Goto(s|11)
 exten => sw-76-TORTURE,10,Goto(${torcont}|s|begin)
-exten => sw-76-TORTURE,11,Goto(s|10)
+exten => sw-76-TORTURE,11,Goto(s|11)
 
 
 [macro-fillcidname]
@@ -1989,7 +2064,7 @@ exten => s,5,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?6:10)
 exten => s,6,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
 exten => s,7,Macro(std-priv-exten|Zap/3r1&Zap/5r1|2|25|mtw|telemarket|telemarket)
 exten => s,8,Hangup()
-exten => s,9,Goto(104)
+exten => s,9,Goto(105)
 exten => s,10,NoOp(Finish if-homeline-87)
 exten => s,11(postPriv),Macro(fillcidname)
 exten => s,12,Set(CONFCIDNA=${CALLERID(name)})
@@ -2008,83 +2083,84 @@ exten => s,24,GotoIf($["${lds}" = "1" ]?25:26)
 exten => s,25,SetMusicOnHold(mohlds)
 exten => s,26,NoOp(Finish if-homeline-90)
 exten => s,27,Set(direct=$[${DB(DirectCall/${CALLERID(num)})}])
-exten => s,28,GotoIf($["${direct}" != "" & ${direct} != 0 ]?29:36)
+exten => s,28,GotoIf($["${direct}" != "" & ${direct} != 0 ]?29:37)
 exten => s,29,verbose(direct is XXX#${direct}XXXX)
 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}|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)
-exten => s,38,Goto(41)
-exten => s,39,Playback(greetings/christmas)
-exten => s,40,Goto(102)
-exten => s,41,GotoIfTime(*|*|31|dec?43)
-exten => s,42,Goto(45)
-exten => s,43,Playback(greetings/newyear)
-exten => s,44,Goto(101)
-exten => s,45,GotoIfTime(*|*|1|jan?47)
-exten => s,46,Goto(49)
-exten => s,47,Playback(greetings/newyear)
-exten => s,48,Goto(100)
-exten => s,49,GotoIfTime(*|*|14|feb?51)
-exten => s,50,Goto(53)
-exten => s,51,Playback(greetings/valentines)
-exten => s,52,Goto(99)
-exten => s,53,GotoIfTime(*|*|17|mar?55)
-exten => s,54,Goto(57)
-exten => s,55,Playback(greetings/stPat)
-exten => s,56,Goto(98)
-exten => s,57,GotoIfTime(*|*|31|oct?59)
-exten => s,58,Goto(61)
-exten => s,59,Playback(greetings/halloween)
-exten => s,60,Goto(97)
-exten => s,61,GotoIfTime(*|mon|15-21|jan?63)
-exten => s,62,Goto(65)
-exten => s,63,Playback(greetings/mlkDay)
-exten => s,64,Goto(96)
-exten => s,65,GotoIfTime(*|thu|22-28|nov?67)
-exten => s,66,Goto(69)
-exten => s,67,Playback(greetings/thanksgiving)
-exten => s,68,Goto(95)
-exten => s,69,GotoIfTime(*|mon|25-31|may?71)
-exten => s,70,Goto(73)
-exten => s,71,Playback(greetings/memorial)
-exten => s,72,Goto(94)
-exten => s,73,GotoIfTime(*|mon|1-7|sep?75)
-exten => s,74,Goto(77)
-exten => s,75,Playback(greetings/labor)
-exten => s,76,Goto(93)
-exten => s,77,GotoIfTime(*|mon|15-21|feb?79)
-exten => s,78,Goto(81)
-exten => s,79,Playback(greetings/president)
-exten => s,80,Goto(92)
-exten => s,81,GotoIfTime(*|sun|8-14|may?83)
-exten => s,82,Goto(85)
-exten => s,83,Playback(greetings/mothers)
-exten => s,84,Goto(91)
-exten => s,85,GotoIfTime(*|sun|15-21|jun?87)
-exten => s,86,Goto(89)
-exten => s,87,Playback(greetings/fathers)
-exten => s,88,Goto(90)
-exten => s,89,Playback(greetings/hello)
-exten => s,90,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101-102-103-104-105)
-exten => s,91,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101-102-103-104)
-exten => s,92,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101-102-103)
-exten => s,93,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101-102)
-exten => s,94,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101)
-exten => s,95,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100)
-exten => s,96,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99)
-exten => s,97,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98)
-exten => s,98,NoOp(Finish iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97)
-exten => s,99,NoOp(Finish iftime-iftime-iftime-iftime-homeline-93-94-95-96)
-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 => s,104,NoOp(End of Extension s)
+exten => s,34,Set(~~EXTEN~~=${EXTEN})
+exten => s,35,Goto(sw-92-${direct}|10)
+exten => s,36,NoOp(Finish switch-if-homeline-91-92)
+exten => s,37,NoOp(Finish if-homeline-91)
+exten => s,38(loopback),GotoIfTime(*|*|20-25|dec?40)
+exten => s,39,Goto(42)
+exten => s,40,Playback(greetings/christmas)
+exten => s,41,Goto(103)
+exten => s,42,GotoIfTime(*|*|31|dec?44)
+exten => s,43,Goto(46)
+exten => s,44,Playback(greetings/newyear)
+exten => s,45,Goto(102)
+exten => s,46,GotoIfTime(*|*|1|jan?48)
+exten => s,47,Goto(50)
+exten => s,48,Playback(greetings/newyear)
+exten => s,49,Goto(101)
+exten => s,50,GotoIfTime(*|*|14|feb?52)
+exten => s,51,Goto(54)
+exten => s,52,Playback(greetings/valentines)
+exten => s,53,Goto(100)
+exten => s,54,GotoIfTime(*|*|17|mar?56)
+exten => s,55,Goto(58)
+exten => s,56,Playback(greetings/stPat)
+exten => s,57,Goto(99)
+exten => s,58,GotoIfTime(*|*|31|oct?60)
+exten => s,59,Goto(62)
+exten => s,60,Playback(greetings/halloween)
+exten => s,61,Goto(98)
+exten => s,62,GotoIfTime(*|mon|15-21|jan?64)
+exten => s,63,Goto(66)
+exten => s,64,Playback(greetings/mlkDay)
+exten => s,65,Goto(97)
+exten => s,66,GotoIfTime(*|thu|22-28|nov?68)
+exten => s,67,Goto(70)
+exten => s,68,Playback(greetings/thanksgiving)
+exten => s,69,Goto(96)
+exten => s,70,GotoIfTime(*|mon|25-31|may?72)
+exten => s,71,Goto(74)
+exten => s,72,Playback(greetings/memorial)
+exten => s,73,Goto(95)
+exten => s,74,GotoIfTime(*|mon|1-7|sep?76)
+exten => s,75,Goto(78)
+exten => s,76,Playback(greetings/labor)
+exten => s,77,Goto(94)
+exten => s,78,GotoIfTime(*|mon|15-21|feb?80)
+exten => s,79,Goto(82)
+exten => s,80,Playback(greetings/president)
+exten => s,81,Goto(93)
+exten => s,82,GotoIfTime(*|sun|8-14|may?84)
+exten => s,83,Goto(86)
+exten => s,84,Playback(greetings/mothers)
+exten => s,85,Goto(92)
+exten => s,86,GotoIfTime(*|sun|15-21|jun?88)
+exten => s,87,Goto(90)
+exten => s,88,Playback(greetings/fathers)
+exten => s,89,Goto(91)
+exten => s,90,Playback(greetings/hello)
+exten => s,91,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101-102-103-104-105)
+exten => s,92,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101-102-103-104)
+exten => s,93,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101-102-103)
+exten => s,94,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101-102)
+exten => s,95,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100-101)
+exten => s,96,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99-100)
+exten => s,97,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98-99)
+exten => s,98,NoOp(Finish iftime-iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97-98)
+exten => s,99,NoOp(Finish iftime-iftime-iftime-iftime-iftime-homeline-93-94-95-96-97)
+exten => s,100,NoOp(Finish iftime-iftime-iftime-iftime-homeline-93-94-95-96)
+exten => s,101,NoOp(Finish iftime-iftime-iftime-homeline-93-94-95)
+exten => s,102,NoOp(Finish iftime-iftime-homeline-93-94)
+exten => s,103,NoOp(Finish iftime-homeline-93)
+exten => s,104,Background(murphy-homeline-intro1)
+exten => s,105,NoOp(End of Extension s)
 exten => _sw-92-.,10,Set(z=${direct}-2)
 exten => _sw-92-.,11,Goto(homeline-kids|${z}|1)
 exten => sw-92-,10,Goto(sw-92-.|10)
diff --git a/pbx/ael/ael-test/ref.ael-vtest17 b/pbx/ael/ael-test/ref.ael-vtest17
index 16e8f218f..0a8e30d31 100644
--- a/pbx/ael/ael-test/ref.ael-vtest17
+++ b/pbx/ael/ael-test/ref.ael-vtest17
@@ -42,9 +42,10 @@ exten => 81,11,Verbose(Which means that the priorities/sec = $[4* ${iterations}
 exten => 81,12,SayNumber($[4 * ${iterations} / (${time2} - ${time1}) ])
 exten => 82,1,Macro(ndeep|100000)
 exten => 82,2,Verbose(Finished 100000 levels deep call!)
-exten => 83,1,Goto(sw-2-${EXTEN}|10)
-exten => 83,2,NoOp(Finish switch-extension-2)
-exten => _sw-2-.,10,Goto(83|2)
+exten => 83,1,Set(~~EXTEN~~=${EXTEN})
+exten => 83,2,Goto(sw-2-${~~EXTEN~~}|10)
+exten => 83,3,NoOp(Finish switch-extension-2)
+exten => _sw-2-.,10,Goto(83|3)
 exten => sw-2-,10,Goto(sw-2-.|10)
 exten => _sw-2-[4-7]X,10,Verbose(and this too!)
 exten => _sw-2-[4-7]X,11,Goto(sw-2-.|10)