diff --git a/main/pbx.c b/main/pbx.c
index 4251d1207b5c3852b7b0bbeaa1865f3b21a0cee8..9b44306bf635eac609012e3335a3d6470e485f19 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -2006,6 +2006,10 @@ static struct match_char *add_exten_to_pattern_tree(struct ast_context *con, str
 			qsort(buf, specif, 1, compare_char);
 			specif <<= 8;
 			specif += buf[0];
+		} else if (*s1 == '-') {
+			/* Skip dashes in patterns */
+			s1++;
+			continue;
 		} else {
 			if (*s1 == '\\') {
 				s1++;
diff --git a/pbx/ael/ael-test/ref.ael-ntest10 b/pbx/ael/ael-test/ref.ael-ntest10
index 1b72c53872d4d8cb1f652067948d0c4223e57924..d81f33947a45a4f40788173f16c9c1d283b1b11f 100644
--- a/pbx/ael/ael-test/ref.ael-ntest10
+++ b/pbx/ael/ael-test/ref.ael-ntest10
@@ -5,26 +5,26 @@
 
 
 (You can use the -w option to dump extensions.conf format to extensions.conf.aeldump)
-LOG: lev:2 file:pbx_ael.c  line:115 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1-4: The macro endsess does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 6-9: The macro nullchk does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 11-26: The macro endcall does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 13-13: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 28-44: The macro endcall2 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 36-36: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 46-68: The macro endcall3 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 48-48: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 60-60: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 70-96: The macro endcall4 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 72-72: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 84-84: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 87-87: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 98-131: The macro endcall5 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 106-106: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 119-119: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:2297 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:131 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:122 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:135 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1-4: The macro endsess does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 6-9: The macro nullchk does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 11-26: The macro endcall does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:2300 func: check_switch_expr  Warning: file ./extensions.ael, line 13-13: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 28-44: The macro endcall2 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:2300 func: check_switch_expr  Warning: file ./extensions.ael, line 36-36: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 46-68: The macro endcall3 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:2300 func: check_switch_expr  Warning: file ./extensions.ael, line 48-48: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2300 func: check_switch_expr  Warning: file ./extensions.ael, line 60-60: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 70-96: The macro endcall4 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:2300 func: check_switch_expr  Warning: file ./extensions.ael, line 72-72: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2300 func: check_switch_expr  Warning: file ./extensions.ael, line 84-84: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2300 func: check_switch_expr  Warning: file ./extensions.ael, line 87-87: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 98-131: The macro endcall5 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:2300 func: check_switch_expr  Warning: file ./extensions.ael, line 106-106: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2300 func: check_switch_expr  Warning: file ./extensions.ael, line 119-119: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2300 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:138 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
 Executed ast_context_find_or_create(conts, name=endsess, registrar=pbx_ael);
 Executed ast_context_find_or_create(conts, name=nullchk, registrar=pbx_ael);
 Executed ast_context_find_or_create(conts, name=endcall, registrar=pbx_ael);
@@ -38,139 +38,144 @@ Executed ast_add_extension2(context=nullchk, rep=0, exten=s, priority=1, label=(
 Executed ast_add_extension2(context=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=nullchk, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
 Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=LOCAL(type)=${ARG1}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=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=endcall, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=endcall, rep=0, exten=sw-1-out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:15, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall, rep=0, exten=sw-1-out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=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=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=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=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=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=endcall, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${EXTEN}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${~~EXTEN~~}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=Goto, data=sw_1_${type},10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall_1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall, rep=0, exten=_sw_1_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=endcall, rep=0, exten=sw_1_out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:15, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall, rep=0, exten=sw_1_out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=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=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=endcall, rep=0, exten=sw_1_out, priority=16, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=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=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=endcall2, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=LOCAL(type)=${ARG1}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=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=endcall2, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=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=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=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=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=endcall2, rep=0, exten=sw-3-out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall2, rep=0, exten=sw-3-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-3-out2,ptr1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=endcall2, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${EXTEN}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${~~EXTEN~~}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=Goto, data=sw_3_${type},10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall2_3, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall2, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall2, rep=0, exten=_sw_3_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=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=endcall2, rep=0, exten=sw_3_out2, priority=11, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=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=endcall2, rep=0, exten=sw_3_out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall2, rep=0, exten=sw_3_out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw_3_out2,ptr1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=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=endcall3, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=LOCAL(type)=${ARG1}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=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=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=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=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=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=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=endcall3, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=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=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=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=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=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=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=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=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=endcall3, rep=0, exten=sw-5-out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-5-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-5-out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-5-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-8-out,ptr1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall3, rep=0, exten=sw-5-out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall3-out-5-6, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=endcall3, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${EXTEN}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${~~EXTEN~~}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=Goto, data=sw_5_${type},10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall3_5, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?7:8, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=Goto, data=sw_8_out,ptr1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=NoOp, data=Finish if_endcall3_7, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=Goto, data=sw_8_${type},10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall3_8, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=s, priority=11, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=_sw_8_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=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=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=endcall3, rep=0, exten=sw_8_out, priority=12, label=(null), callerid=(null), appl=Goto, data=s,10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=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=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=endcall3, rep=0, exten=_sw_5_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=endcall3, rep=0, exten=sw_5_out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_5_out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_5_out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_5_out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw_8_out,ptr1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall3, rep=0, exten=sw_5_out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if_sw_endcall3_out_5_6, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=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=endcall4, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=LOCAL(type)=${ARG1}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=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=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=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=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=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=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=endcall4, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=endcall4, rep=0, exten=sw-10-out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-10-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-10-out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-10-out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-14-in,ptr1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall4, rep=0, exten=sw-10-out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall4-out-10-11, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=endcall4, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${EXTEN}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${~~EXTEN~~}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=Goto, data=sw_10_${type},10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall4_10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?7:8, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=Goto, data=sw_14_in,ptr1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=NoOp, data=Finish if_endcall4_12, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=Goto, data=sw_13_${type},10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall4_13, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=s, priority=11, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=_sw_13_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=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=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=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=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=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=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=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=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=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=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=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=endcall4, rep=0, exten=_sw_10_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=endcall4, rep=0, exten=sw_10_out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_10_out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_10_out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_10_out, priority=13, label=(null), callerid=(null), appl=Goto, data=sw_14_in,ptr1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall4, rep=0, exten=sw_10_out, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if_sw_endcall4_out_10_11, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=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=endcall5, rep=0, exten=s, priority=1, label=(null), callerid=(null), appl=Set, data=LOCAL(type)=${ARG1}, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=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=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=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=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=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=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=endcall5, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=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=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=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=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=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=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=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=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=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=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=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=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=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=endcall5, rep=0, exten=sw-16-in, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=11, label=ptr2, callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=13, label=(null), callerid=(null), appl=Goto, data=sw-21-in,ptr1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if-sw-endcall5-in-16-18, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=15, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-in, priority=16, label=(null), callerid=(null), appl=Goto, data=sw-16-.,10, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=endcall5, rep=0, exten=sw-16-out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael);
-Executed ast_add_extension2(context=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=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=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:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=2, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${EXTEN}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=3, label=(null), callerid=(null), appl=Set, data=LOCAL(~~EXTEN~~)=${~~EXTEN~~}, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=4, label=(null), callerid=(null), appl=Goto, data=sw_16_${type},10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=5, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall5_16, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=6, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?7:8, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=7, label=(null), callerid=(null), appl=Goto, data=sw_21_in,ptr1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=8, label=(null), callerid=(null), appl=NoOp, data=Finish if_endcall5_19, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=9, label=(null), callerid=(null), appl=Goto, data=sw_20_${type},10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=10, label=(null), callerid=(null), appl=NoOp, data=Finish switch_endcall5_20, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=s, priority=11, label=(null), callerid=(null), appl=Return, data=, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=_sw_20_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=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=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=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=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=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=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=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=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=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=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=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=endcall5, rep=0, exten=_sw_16_., priority=10, label=(null), callerid=(null), appl=Goto, data=s,5, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=endcall5, rep=0, exten=sw_16_in, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=11, label=ptr2, callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=13, label=(null), callerid=(null), appl=Goto, data=sw_21_in,ptr1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=14, label=(null), callerid=(null), appl=NoOp, data=Finish if_sw_endcall5_in_16_18, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=15, label=(null), callerid=(null), appl=Noop, data=esac, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_in, priority=16, label=(null), callerid=(null), appl=Goto, data=sw_16_.,10, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_out, priority=10, label=(null), callerid=(null), appl=Gosub, data=nullchk,s,1(callid), FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_out, priority=11, label=(null), callerid=(null), appl=GotoIf, data=$[${testnotnull}]?12:14, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=endcall5, rep=0, exten=sw_16_out, priority=12, label=(null), callerid=(null), appl=Gosub, data=endsess,s,1, FREE, registrar=pbx_ael);
+Executed ast_add_extension2(context=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=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=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:145 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:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:150 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:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:518 func: main  7 contexts, 37 extensions, 136 priorities
+LOG: lev:2 file:pbx_ael.c  line:153 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:516 func: main  7 contexts, 37 extensions, 141 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test1 b/pbx/ael/ael-test/ref.ael-test1
index 636aae1340e6d25303a9df8e3f963cbeef2342e8..4257fa04c5933ffea04815ee0316bd77c09ef5e5 100644
--- a/pbx/ael/ael-test/ref.ael-test1
+++ b/pbx/ael/ael-test/ref.ael-test1
@@ -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:115 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 2-16: The macro testdial does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 18-25: The macro exten-gen does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:1362 func: check_goto  Warning: file ./extensions.ael, line 21-21: It's bad form to have a goto in a macro to a target outside the macro!
-LOG: lev:3 file:pval.c  line:1362 func: check_goto  Warning: file ./extensions.ael, line 23-23: It's bad form to have a goto in a macro to a target outside the macro!
-LOG: lev:3 file:pval.c  line:2284 func: check_switch_expr  Warning: file ./extensions.ael, line 58-58: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:922 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:pval.c  line:880 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:131 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:518 func: main  5 contexts, 16 extensions, 159 priorities
+LOG: lev:2 file:pbx_ael.c  line:122 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:135 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 2-16: The macro testdial does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 18-25: The macro exten-gen does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:1365 func: check_goto  Warning: file ./extensions.ael, line 21-21: It's bad form to have a goto in a macro to a target outside the macro!
+LOG: lev:3 file:pval.c  line:1365 func: check_goto  Warning: file ./extensions.ael, line 23-23: It's bad form to have a goto in a macro to a target outside the macro!
+LOG: lev:3 file:pval.c  line:2300 func: check_switch_expr  Warning: file ./extensions.ael, line 58-58: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:925 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:pval.c  line:883 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:138 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:145 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:150 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:153 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:516 func: main  5 contexts, 16 extensions, 160 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test19 b/pbx/ael/ael-test/ref.ael-test19
index 67519dafda2eb218431b3793b0ce26591975e024..47db4079e6c46fd96d7920a775760f894a181588 100644
--- a/pbx/ael/ael-test/ref.ael-test19
+++ b/pbx/ael/ael-test/ref.ael-test19
@@ -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:115 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pval.c  line:2313 func: check_context_names  Warning: file ./extensions.ael, line 49-62: The context name (incoming) is also declared in file ./extensions.ael, line 62-69! (and neither is marked 'extend')
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 71-175: The macro std-priv-exten does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:2297 func: check_switch_expr  Warning: file ./extensions.ael, line 245-246: A default case was automatically added to the switch.
-LOG: lev:3 file:pval.c  line:2439 func: check_pval_item  Warning: file ./extensions.ael, line 312-312: macro call to non-existent funcA! (Not even in the extensions.conf stuff!)
-LOG: lev:3 file:pval.c  line:2439 func: check_pval_item  Warning: file ./extensions.ael, line 313-313: macro call to non-existent funcD! (Not even in the extensions.conf stuff!)
-LOG: lev:3 file:pval.c  line:1346 func: check_goto  Warning: file ./extensions.ael, line 319-319: goto:  Couldn't find goto target test5|s|1, not even in extensions.conf!
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 363-366: The macro dialoutpstn does not end with a return; I will insert one.
-LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:518 func: main  13 contexts, 57 extensions, 190 priorities
+LOG: lev:2 file:pbx_ael.c  line:122 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:135 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:3 file:pval.c  line:2316 func: check_context_names  Warning: file ./extensions.ael, line 49-62: The context name (incoming) is also declared in file ./extensions.ael, line 62-69! (and neither is marked 'extend')
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 71-175: The macro std-priv-exten does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:2300 func: check_switch_expr  Warning: file ./extensions.ael, line 245-246: A default case was automatically added to the switch.
+LOG: lev:3 file:pval.c  line:2442 func: check_pval_item  Warning: file ./extensions.ael, line 312-312: macro call to non-existent funcA! (Not even in the extensions.conf stuff!)
+LOG: lev:3 file:pval.c  line:2442 func: check_pval_item  Warning: file ./extensions.ael, line 313-313: macro call to non-existent funcD! (Not even in the extensions.conf stuff!)
+LOG: lev:3 file:pval.c  line:1349 func: check_goto  Warning: file ./extensions.ael, line 319-319: goto:  Couldn't find goto target test5|s|1, not even in extensions.conf!
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 363-366: The macro dialoutpstn does not end with a return; I will insert one.
+LOG: lev:2 file:pbx_ael.c  line:138 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:145 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:150 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:153 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:516 func: main  13 contexts, 57 extensions, 191 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test2 b/pbx/ael/ael-test/ref.ael-test2
index 892b63464a672a845766f43311a4dbc05113ccde..bd4edc3dfd07dcda0324f848389a20908578f624 100644
--- a/pbx/ael/ael-test/ref.ael-test2
+++ b/pbx/ael/ael-test/ref.ael-test2
@@ -2,27 +2,26 @@
 (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:113 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././apptest.ael2, 3474 chars
-LOG: lev:3 file:ael.y  line:546 func: ael_yyparse  ==== File: ././apptest.ael2, Line 46, Cols: 8-11: Suggestion: Use the goto statement instead of the Goto() application call in AEL.
-LOG: lev:2 file:pbx_ael.c  line:126 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 35-35: application call to EndWhile affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 37-37: application call to ExecIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 38-38: application call to ExecIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 44-44: application call to Gosub affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 45-45: application call to GosubIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:1346 func: check_goto  Warning: file ././apptest.ael2, line 46-46: goto:  Couldn't find goto target cont|exten|prior, not even in extensions.conf!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 47-47: application call to GotoIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 48-48: application call to GotoIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 58-58: application call to Macro affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2512 func: check_pval_item  Warning: file ././apptest.ael2, line 59-59: I am converting the MacroExit call here to a return statement.
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 60-60: application call to MacroIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 85-85: application call to Random affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 94-94: application call to Return affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 119-119: application call to StackPop affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 141-141: application call to While affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:2 file:pbx_ael.c  line:129 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:137 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:531 func: main  1 contexts, 1 extensions, 142 priorities
+LOG: lev:2 file:pbx_ael.c  line:122 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:ael.flex  line:883 func: setup_filestack    --Read in included file ././apptest.ael2, 3474 chars
+LOG: lev:3 file:ael.y  line:605 func: ael_yyparse  ==== File: ././apptest.ael2, Line 46, Cols: 8-12: Suggestion: Use the goto statement instead of the Goto() application call in AEL.
+LOG: lev:2 file:pbx_ael.c  line:135 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 35-35: application call to EndWhile affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 37-37: application call to ExecIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 38-38: application call to ExecIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 44-44: application call to Gosub affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 45-45: application call to GosubIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:1349 func: check_goto  Warning: file ././apptest.ael2, line 46-46: goto:  Couldn't find goto target cont|exten|prior, not even in extensions.conf!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 47-47: application call to GotoIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 48-48: application call to GotoIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 58-58: application call to Macro affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2527 func: check_pval_item  Warning: file ././apptest.ael2, line 59-59: I am converting the MacroExit call here to a return statement.
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 60-60: application call to MacroIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 85-85: application call to Random affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 119-119: application call to StackPop affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 141-141: application call to While affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:2 file:pbx_ael.c  line:138 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:145 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:150 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:153 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:516 func: main  1 contexts, 1 extensions, 142 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test3 b/pbx/ael/ael-test/ref.ael-test3
index 775203b7e7b58141226e39aaa69f77526ff38a99..48b4252d86b039beda42952b462e05e39eeaa849 100644
--- a/pbx/ael/ael-test/ref.ael-test3
+++ b/pbx/ael/ael-test/ref.ael-test3
@@ -2,98 +2,98 @@
 (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:115 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:ael.flex  line:672 func: setup_filestack    --Read in included file ././include1.ael2, 78 chars
-LOG: lev:2 file:ael.flex  line:672 func: setup_filestack    --Read in included file ././include2.ael2, 98 chars
-LOG: lev:2 file:ael.flex  line:672 func: setup_filestack    --Read in included file ././include3.ael2, 57 chars
-LOG: lev:2 file:ael.flex  line:672 func: setup_filestack    --Read in included file ././include5.ael2, 56 chars
-LOG: lev:2 file:ael.flex  line:672 func: setup_filestack    --Read in included file ././include4.ael2, 87 chars
-LOG: lev:2 file:ael.flex  line:672 func: setup_filestack    --Read in included file ././telemarket_torture.ael2, 28036 chars
-LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 14-34: The macro std-exten does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:1362 func: check_goto  Warning: file ./extensions.ael, line 17-17: It's bad form to have a goto in a macro to a target outside the macro!
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 36-59: The macro std-priv-exten_1 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 62-85: The macro std-priv-exten_2 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 88-111: The macro std-priv-exten_3 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 114-137: The macro std-priv-exten_4 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 140-163: The macro std-priv-exten_5 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 166-189: The macro std-priv-exten_6 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 192-215: The macro std-priv-exten_7 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 218-241: The macro std-priv-exten_8 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 244-267: The macro std-priv-exten_9 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 270-293: The macro std-priv-exten_10 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 296-319: The macro std-priv-exten_11 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 322-345: The macro std-priv-exten_12 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 348-371: The macro std-priv-exten_13 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 374-397: The macro std-priv-exten_14 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 400-423: The macro std-priv-exten_15 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 426-449: The macro std-priv-exten_16 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 452-475: The macro std-priv-exten_17 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 478-501: The macro std-priv-exten_18 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 504-527: The macro std-priv-exten_19 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 530-553: The macro std-priv-exten_20 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 556-579: The macro std-priv-exten_21 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 582-605: The macro std-priv-exten_22 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 608-631: The macro std-priv-exten_23 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 634-657: The macro std-priv-exten_24 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 660-683: The macro std-priv-exten_25 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 686-709: The macro std-priv-exten_26 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 712-735: The macro std-priv-exten_27 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 738-761: The macro std-priv-exten_28 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 764-787: The macro std-priv-exten_29 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 790-813: The macro std-priv-exten_30 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 816-839: The macro std-priv-exten_31 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 842-865: The macro std-priv-exten_32 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 868-891: The macro std-priv-exten_33 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 894-917: The macro std-priv-exten_34 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 920-943: The macro std-priv-exten_35 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 946-969: The macro std-priv-exten_36 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 972-995: The macro std-priv-exten_37 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 998-1021: The macro std-priv-exten_38 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1024-1047: The macro std-priv-exten_39 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1050-1073: The macro std-priv-exten_40 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1076-1099: The macro std-priv-exten_41 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1102-1125: The macro std-priv-exten_42 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1128-1151: The macro std-priv-exten_43 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1154-1177: The macro std-priv-exten_44 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1180-1203: The macro std-priv-exten_45 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1206-1229: The macro std-priv-exten_46 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1232-1255: The macro std-priv-exten_47 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1258-1281: The macro std-priv-exten_48 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1284-1307: The macro std-priv-exten_49 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1310-1333: The macro std-priv-exten_50 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1336-1359: The macro std-priv-exten_51 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1362-1385: The macro std-priv-exten_52 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1388-1411: The macro std-priv-exten_53 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1414-1437: The macro std-priv-exten_54 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1440-1463: The macro std-priv-exten_55 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1466-1489: The macro std-priv-exten_56 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1492-1515: The macro std-priv-exten_57 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1518-1541: The macro std-priv-exten_58 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1544-1567: The macro std-priv-exten_59 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1570-1593: The macro std-priv-exten_60 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1596-1619: The macro std-priv-exten_61 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1622-1645: The macro std-priv-exten_62 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1648-1671: The macro std-priv-exten_63 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1674-1697: The macro std-priv-exten_64 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1700-1723: The macro std-priv-exten_65 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1726-1749: The macro std-priv-exten_66 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1752-1775: The macro std-priv-exten_67 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1778-1801: The macro std-priv-exten_68 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1804-1827: The macro std-priv-exten_69 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1830-1853: The macro std-priv-exten_70 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1856-1879: The macro std-priv-exten_71 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1882-1905: The macro std-priv-exten_72 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1908-1931: The macro std-priv-exten_73 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1934-1957: The macro std-priv-exten does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1959-1995: The macro fillcidname does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 1997-2015: The macro ciddial does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 2017-2028: The macro ciddial3 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 2030-2048: The macro ciddial2 does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 2050-2065: The macro callerid-liar does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 2067-2072: The macro callerid-bad does not end with a return; I will insert one.
-LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:518 func: main  172 contexts, 934 extensions, 2558 priorities
+LOG: lev:2 file:pbx_ael.c  line:122 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:ael.flex  line:883 func: setup_filestack    --Read in included file ././include1.ael2, 78 chars
+LOG: lev:2 file:ael.flex  line:883 func: setup_filestack    --Read in included file ././include2.ael2, 98 chars
+LOG: lev:2 file:ael.flex  line:883 func: setup_filestack    --Read in included file ././include3.ael2, 57 chars
+LOG: lev:2 file:ael.flex  line:883 func: setup_filestack    --Read in included file ././include5.ael2, 56 chars
+LOG: lev:2 file:ael.flex  line:883 func: setup_filestack    --Read in included file ././include4.ael2, 87 chars
+LOG: lev:2 file:ael.flex  line:883 func: setup_filestack    --Read in included file ././telemarket_torture.ael2, 28036 chars
+LOG: lev:2 file:pbx_ael.c  line:135 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 14-34: The macro std-exten does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:1365 func: check_goto  Warning: file ./extensions.ael, line 17-17: It's bad form to have a goto in a macro to a target outside the macro!
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 36-59: The macro std-priv-exten_1 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 62-85: The macro std-priv-exten_2 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 88-111: The macro std-priv-exten_3 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 114-137: The macro std-priv-exten_4 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 140-163: The macro std-priv-exten_5 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 166-189: The macro std-priv-exten_6 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 192-215: The macro std-priv-exten_7 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 218-241: The macro std-priv-exten_8 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 244-267: The macro std-priv-exten_9 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 270-293: The macro std-priv-exten_10 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 296-319: The macro std-priv-exten_11 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 322-345: The macro std-priv-exten_12 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 348-371: The macro std-priv-exten_13 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 374-397: The macro std-priv-exten_14 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 400-423: The macro std-priv-exten_15 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 426-449: The macro std-priv-exten_16 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 452-475: The macro std-priv-exten_17 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 478-501: The macro std-priv-exten_18 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 504-527: The macro std-priv-exten_19 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 530-553: The macro std-priv-exten_20 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 556-579: The macro std-priv-exten_21 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 582-605: The macro std-priv-exten_22 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 608-631: The macro std-priv-exten_23 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 634-657: The macro std-priv-exten_24 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 660-683: The macro std-priv-exten_25 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 686-709: The macro std-priv-exten_26 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 712-735: The macro std-priv-exten_27 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 738-761: The macro std-priv-exten_28 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 764-787: The macro std-priv-exten_29 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 790-813: The macro std-priv-exten_30 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 816-839: The macro std-priv-exten_31 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 842-865: The macro std-priv-exten_32 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 868-891: The macro std-priv-exten_33 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 894-917: The macro std-priv-exten_34 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 920-943: The macro std-priv-exten_35 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 946-969: The macro std-priv-exten_36 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 972-995: The macro std-priv-exten_37 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 998-1021: The macro std-priv-exten_38 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1024-1047: The macro std-priv-exten_39 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1050-1073: The macro std-priv-exten_40 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1076-1099: The macro std-priv-exten_41 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1102-1125: The macro std-priv-exten_42 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1128-1151: The macro std-priv-exten_43 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1154-1177: The macro std-priv-exten_44 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1180-1203: The macro std-priv-exten_45 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1206-1229: The macro std-priv-exten_46 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1232-1255: The macro std-priv-exten_47 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1258-1281: The macro std-priv-exten_48 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1284-1307: The macro std-priv-exten_49 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1310-1333: The macro std-priv-exten_50 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1336-1359: The macro std-priv-exten_51 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1362-1385: The macro std-priv-exten_52 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1388-1411: The macro std-priv-exten_53 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1414-1437: The macro std-priv-exten_54 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1440-1463: The macro std-priv-exten_55 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1466-1489: The macro std-priv-exten_56 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1492-1515: The macro std-priv-exten_57 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1518-1541: The macro std-priv-exten_58 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1544-1567: The macro std-priv-exten_59 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1570-1593: The macro std-priv-exten_60 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1596-1619: The macro std-priv-exten_61 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1622-1645: The macro std-priv-exten_62 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1648-1671: The macro std-priv-exten_63 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1674-1697: The macro std-priv-exten_64 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1700-1723: The macro std-priv-exten_65 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1726-1749: The macro std-priv-exten_66 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1752-1775: The macro std-priv-exten_67 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1778-1801: The macro std-priv-exten_68 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1804-1827: The macro std-priv-exten_69 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1830-1853: The macro std-priv-exten_70 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1856-1879: The macro std-priv-exten_71 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1882-1905: The macro std-priv-exten_72 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1908-1931: The macro std-priv-exten_73 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1934-1957: The macro std-priv-exten does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1959-1995: The macro fillcidname does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 1997-2015: The macro ciddial does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 2017-2028: The macro ciddial3 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 2030-2048: The macro ciddial2 does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 2050-2065: The macro callerid-liar does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 2067-2072: The macro callerid-bad does not end with a return; I will insert one.
+LOG: lev:2 file:pbx_ael.c  line:138 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:145 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:150 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:153 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:516 func: main  172 contexts, 934 extensions, 2634 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test4 b/pbx/ael/ael-test/ref.ael-test4
index 892b63464a672a845766f43311a4dbc05113ccde..bd4edc3dfd07dcda0324f848389a20908578f624 100644
--- a/pbx/ael/ael-test/ref.ael-test4
+++ b/pbx/ael/ael-test/ref.ael-test4
@@ -2,27 +2,26 @@
 (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:113 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:ael.flex  line:662 func: setup_filestack    --Read in included file ././apptest.ael2, 3474 chars
-LOG: lev:3 file:ael.y  line:546 func: ael_yyparse  ==== File: ././apptest.ael2, Line 46, Cols: 8-11: Suggestion: Use the goto statement instead of the Goto() application call in AEL.
-LOG: lev:2 file:pbx_ael.c  line:126 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 35-35: application call to EndWhile affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 37-37: application call to ExecIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 38-38: application call to ExecIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 44-44: application call to Gosub affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 45-45: application call to GosubIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:1346 func: check_goto  Warning: file ././apptest.ael2, line 46-46: goto:  Couldn't find goto target cont|exten|prior, not even in extensions.conf!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 47-47: application call to GotoIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 48-48: application call to GotoIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 58-58: application call to Macro affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2512 func: check_pval_item  Warning: file ././apptest.ael2, line 59-59: I am converting the MacroExit call here to a return statement.
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 60-60: application call to MacroIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 85-85: application call to Random affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 94-94: application call to Return affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 119-119: application call to StackPop affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:3 file:pval.c  line:2507 func: check_pval_item  Warning: file ././apptest.ael2, line 141-141: application call to While affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
-LOG: lev:2 file:pbx_ael.c  line:129 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:137 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:531 func: main  1 contexts, 1 extensions, 142 priorities
+LOG: lev:2 file:pbx_ael.c  line:122 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:ael.flex  line:883 func: setup_filestack    --Read in included file ././apptest.ael2, 3474 chars
+LOG: lev:3 file:ael.y  line:605 func: ael_yyparse  ==== File: ././apptest.ael2, Line 46, Cols: 8-12: Suggestion: Use the goto statement instead of the Goto() application call in AEL.
+LOG: lev:2 file:pbx_ael.c  line:135 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 35-35: application call to EndWhile affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 37-37: application call to ExecIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 38-38: application call to ExecIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 44-44: application call to Gosub affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 45-45: application call to GosubIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:1349 func: check_goto  Warning: file ././apptest.ael2, line 46-46: goto:  Couldn't find goto target cont|exten|prior, not even in extensions.conf!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 47-47: application call to GotoIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 48-48: application call to GotoIfTime affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 58-58: application call to Macro affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2527 func: check_pval_item  Warning: file ././apptest.ael2, line 59-59: I am converting the MacroExit call here to a return statement.
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 60-60: application call to MacroIf affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 85-85: application call to Random affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 119-119: application call to StackPop affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:3 file:pval.c  line:2522 func: check_pval_item  Warning: file ././apptest.ael2, line 141-141: application call to While affects flow of control, and needs to be re-written using AEL if, while, goto, etc. keywords instead!
+LOG: lev:2 file:pbx_ael.c  line:138 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:145 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:150 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:153 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:516 func: main  1 contexts, 1 extensions, 142 priorities
diff --git a/pbx/ael/ael-test/ref.ael-test5 b/pbx/ael/ael-test/ref.ael-test5
index 7be8a951fa8848a8260a18b9067d508a8c1d1845..10657ce632ac964e424db7bff3298892b32d1a98 100644
--- a/pbx/ael/ael-test/ref.ael-test5
+++ b/pbx/ael/ael-test/ref.ael-test5
@@ -2,13 +2,13 @@
 (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:115 func: pbx_load_module  Starting AEL load process.
-LOG: lev:2 file:pbx_ael.c  line:128 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 130-183: The macro stdexten does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 185-192: The macro uvm does not end with a return; I will insert one.
-LOG: lev:3 file:pval.c  line:671 func: check_macro_returns  Warning: file ./extensions.ael, line 194-201: The macro bvm does not end with a return; I will insert one.
-LOG: lev:2 file:pbx_ael.c  line:131 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:134 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:139 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
-LOG: lev:2 file:pbx_ael.c  line:142 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
-LOG: lev:4 file:ael2_parse  line:518 func: main  38 contexts, 91 extensions, 494 priorities
+LOG: lev:2 file:pbx_ael.c  line:122 func: pbx_load_module  Starting AEL load process.
+LOG: lev:2 file:pbx_ael.c  line:135 func: pbx_load_module  AEL load process: parsed config file name './extensions.ael'.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 130-183: The macro stdexten does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 185-192: The macro uvm does not end with a return; I will insert one.
+LOG: lev:3 file:pval.c  line:673 func: check_macro_returns  Warning: file ./extensions.ael, line 194-201: The macro bvm does not end with a return; I will insert one.
+LOG: lev:2 file:pbx_ael.c  line:138 func: pbx_load_module  AEL load process: checked config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:145 func: pbx_load_module  AEL load process: compiled config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:150 func: pbx_load_module  AEL load process: merged config file name './extensions.ael'.
+LOG: lev:2 file:pbx_ael.c  line:153 func: pbx_load_module  AEL load process: verified config file name './extensions.ael'.
+LOG: lev:4 file:ael2_parse  line:516 func: main  38 contexts, 91 extensions, 495 priorities
diff --git a/pbx/ael/ael-test/ref.ael-vtest13 b/pbx/ael/ael-test/ref.ael-vtest13
index 07ae29ed36e2c1499beebd4d6dbd7212a7a3f8a0..acecaaacf902dd209250b23c0256a89976c1b0f4 100644
--- a/pbx/ael/ael-test/ref.ael-vtest13
+++ b/pbx/ael/ael-test/ref.ael-vtest13
@@ -13,20 +13,21 @@ FWDVMBOX=1
 [std-exten]
 exten => s,1,Set(LOCAL(ext)=${ARG1})
 exten => s,2,Set(LOCAL(dev)=${ARG2})
-exten => s,3,Set(~~EXTEN~~=${EXTEN})
-exten => s,4,Dial(${dev}/${ext},20)
-exten => s,5,Goto(sw-1-${DIALSTATUS},10)
-exten => s,6,NoOp(Finish switch-std-exten-1)
-exten => s,7,Return()
+exten => s,3,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,4,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,5,Dial(${dev}/${ext},20)
+exten => s,6,Goto(sw_1_${DIALSTATUS},10)
+exten => s,7,NoOp(Finish switch_std-exten_1)
+exten => s,8,Return()
 exten => a,1,VoiceMailMain(${ext})
-exten => _sw-1-.,10,Voicemail(u${ext})
-exten => _sw-1-.,11,Goto(s,6)
-exten => sw-1-,10,Goto(sw-1-.,10)
-exten => sw-1-ANSWER,10,Goto(s,6)
-exten => sw-1-NOANSWER,10,Voicemail(u${ext})
-exten => sw-1-NOANSWER,11,Goto(s,6)
-exten => sw-1-BUSY,10,Voicemail(b${ext})
-exten => sw-1-BUSY,11,Goto(s,6)
+exten => _sw_1_.,10,Voicemail(u${ext})
+exten => _sw_1_.,11,Goto(s,7)
+exten => sw_1_,10,Goto(sw_1_.,10)
+exten => sw_1_ANSWER,10,Goto(s,7)
+exten => sw_1_NOANSWER,10,Voicemail(u${ext})
+exten => sw_1_NOANSWER,11,Goto(s,7)
+exten => sw_1_BUSY,10,Voicemail(b${ext})
+exten => sw_1_BUSY,11,Goto(s,7)
 
 
 [std-priv-exten_1]
@@ -36,24 +37,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-3-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_1-3)
-exten => s,12,Return()
-exten => _sw-3-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-3-ANSWER,10,Goto(s,11)
-exten => sw-3-BUSY,10,Voicemail(b${ext})
-exten => sw-3-BUSY,11,Goto(s,11)
-exten => sw-3-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-3-DONTCALL,11,Goto(s,11)
-exten => sw-3-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-3-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_3_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_1_3)
+exten => s,13,Return()
+exten => _sw_3_.,10,Voicemail(u${ext})
+exten => _sw_3_.,11,Goto(s,12)
+exten => sw_3_,10,Goto(sw_3_.,10)
+exten => sw_3_NOANSWER,10,Voicemail(u${ext})
+exten => sw_3_NOANSWER,11,Goto(s,12)
+exten => sw_3_ANSWER,10,Goto(s,12)
+exten => sw_3_BUSY,10,Voicemail(b${ext})
+exten => sw_3_BUSY,11,Goto(s,12)
+exten => sw_3_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_3_DONTCALL,11,Goto(s,12)
+exten => sw_3_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_3_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_2]
@@ -63,24 +65,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-4-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_2-4)
-exten => s,12,Return()
-exten => _sw-4-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-4-ANSWER,10,Goto(s,11)
-exten => sw-4-BUSY,10,Voicemail(b${ext})
-exten => sw-4-BUSY,11,Goto(s,11)
-exten => sw-4-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-4-DONTCALL,11,Goto(s,11)
-exten => sw-4-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-4-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_4_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_2_4)
+exten => s,13,Return()
+exten => _sw_4_.,10,Voicemail(u${ext})
+exten => _sw_4_.,11,Goto(s,12)
+exten => sw_4_,10,Goto(sw_4_.,10)
+exten => sw_4_NOANSWER,10,Voicemail(u${ext})
+exten => sw_4_NOANSWER,11,Goto(s,12)
+exten => sw_4_ANSWER,10,Goto(s,12)
+exten => sw_4_BUSY,10,Voicemail(b${ext})
+exten => sw_4_BUSY,11,Goto(s,12)
+exten => sw_4_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_4_DONTCALL,11,Goto(s,12)
+exten => sw_4_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_4_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_3]
@@ -90,24 +93,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-5-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_3-5)
-exten => s,12,Return()
-exten => _sw-5-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-5-ANSWER,10,Goto(s,11)
-exten => sw-5-BUSY,10,Voicemail(b${ext})
-exten => sw-5-BUSY,11,Goto(s,11)
-exten => sw-5-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-5-DONTCALL,11,Goto(s,11)
-exten => sw-5-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-5-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_5_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_3_5)
+exten => s,13,Return()
+exten => _sw_5_.,10,Voicemail(u${ext})
+exten => _sw_5_.,11,Goto(s,12)
+exten => sw_5_,10,Goto(sw_5_.,10)
+exten => sw_5_NOANSWER,10,Voicemail(u${ext})
+exten => sw_5_NOANSWER,11,Goto(s,12)
+exten => sw_5_ANSWER,10,Goto(s,12)
+exten => sw_5_BUSY,10,Voicemail(b${ext})
+exten => sw_5_BUSY,11,Goto(s,12)
+exten => sw_5_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_5_DONTCALL,11,Goto(s,12)
+exten => sw_5_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_5_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_4]
@@ -117,24 +121,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-6-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_4-6)
-exten => s,12,Return()
-exten => _sw-6-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-6-ANSWER,10,Goto(s,11)
-exten => sw-6-BUSY,10,Voicemail(b${ext})
-exten => sw-6-BUSY,11,Goto(s,11)
-exten => sw-6-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-6-DONTCALL,11,Goto(s,11)
-exten => sw-6-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-6-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_6_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_4_6)
+exten => s,13,Return()
+exten => _sw_6_.,10,Voicemail(u${ext})
+exten => _sw_6_.,11,Goto(s,12)
+exten => sw_6_,10,Goto(sw_6_.,10)
+exten => sw_6_NOANSWER,10,Voicemail(u${ext})
+exten => sw_6_NOANSWER,11,Goto(s,12)
+exten => sw_6_ANSWER,10,Goto(s,12)
+exten => sw_6_BUSY,10,Voicemail(b${ext})
+exten => sw_6_BUSY,11,Goto(s,12)
+exten => sw_6_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_6_DONTCALL,11,Goto(s,12)
+exten => sw_6_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_6_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_5]
@@ -144,24 +149,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-7-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_5-7)
-exten => s,12,Return()
-exten => _sw-7-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-7-ANSWER,10,Goto(s,11)
-exten => sw-7-BUSY,10,Voicemail(b${ext})
-exten => sw-7-BUSY,11,Goto(s,11)
-exten => sw-7-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-7-DONTCALL,11,Goto(s,11)
-exten => sw-7-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-7-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_7_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_5_7)
+exten => s,13,Return()
+exten => _sw_7_.,10,Voicemail(u${ext})
+exten => _sw_7_.,11,Goto(s,12)
+exten => sw_7_,10,Goto(sw_7_.,10)
+exten => sw_7_NOANSWER,10,Voicemail(u${ext})
+exten => sw_7_NOANSWER,11,Goto(s,12)
+exten => sw_7_ANSWER,10,Goto(s,12)
+exten => sw_7_BUSY,10,Voicemail(b${ext})
+exten => sw_7_BUSY,11,Goto(s,12)
+exten => sw_7_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_7_DONTCALL,11,Goto(s,12)
+exten => sw_7_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_7_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_6]
@@ -171,24 +177,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-8-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_6-8)
-exten => s,12,Return()
-exten => _sw-8-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-8-ANSWER,10,Goto(s,11)
-exten => sw-8-BUSY,10,Voicemail(b${ext})
-exten => sw-8-BUSY,11,Goto(s,11)
-exten => sw-8-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-8-DONTCALL,11,Goto(s,11)
-exten => sw-8-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-8-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_8_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_6_8)
+exten => s,13,Return()
+exten => _sw_8_.,10,Voicemail(u${ext})
+exten => _sw_8_.,11,Goto(s,12)
+exten => sw_8_,10,Goto(sw_8_.,10)
+exten => sw_8_NOANSWER,10,Voicemail(u${ext})
+exten => sw_8_NOANSWER,11,Goto(s,12)
+exten => sw_8_ANSWER,10,Goto(s,12)
+exten => sw_8_BUSY,10,Voicemail(b${ext})
+exten => sw_8_BUSY,11,Goto(s,12)
+exten => sw_8_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_8_DONTCALL,11,Goto(s,12)
+exten => sw_8_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_8_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_7]
@@ -198,24 +205,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-9-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_7-9)
-exten => s,12,Return()
-exten => _sw-9-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-9-ANSWER,10,Goto(s,11)
-exten => sw-9-BUSY,10,Voicemail(b${ext})
-exten => sw-9-BUSY,11,Goto(s,11)
-exten => sw-9-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-9-DONTCALL,11,Goto(s,11)
-exten => sw-9-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-9-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_9_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_7_9)
+exten => s,13,Return()
+exten => _sw_9_.,10,Voicemail(u${ext})
+exten => _sw_9_.,11,Goto(s,12)
+exten => sw_9_,10,Goto(sw_9_.,10)
+exten => sw_9_NOANSWER,10,Voicemail(u${ext})
+exten => sw_9_NOANSWER,11,Goto(s,12)
+exten => sw_9_ANSWER,10,Goto(s,12)
+exten => sw_9_BUSY,10,Voicemail(b${ext})
+exten => sw_9_BUSY,11,Goto(s,12)
+exten => sw_9_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_9_DONTCALL,11,Goto(s,12)
+exten => sw_9_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_9_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_8]
@@ -225,24 +233,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-10-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_8-10)
-exten => s,12,Return()
-exten => _sw-10-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-10-ANSWER,10,Goto(s,11)
-exten => sw-10-BUSY,10,Voicemail(b${ext})
-exten => sw-10-BUSY,11,Goto(s,11)
-exten => sw-10-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-10-DONTCALL,11,Goto(s,11)
-exten => sw-10-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-10-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_10_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_8_10)
+exten => s,13,Return()
+exten => _sw_10_.,10,Voicemail(u${ext})
+exten => _sw_10_.,11,Goto(s,12)
+exten => sw_10_,10,Goto(sw_10_.,10)
+exten => sw_10_NOANSWER,10,Voicemail(u${ext})
+exten => sw_10_NOANSWER,11,Goto(s,12)
+exten => sw_10_ANSWER,10,Goto(s,12)
+exten => sw_10_BUSY,10,Voicemail(b${ext})
+exten => sw_10_BUSY,11,Goto(s,12)
+exten => sw_10_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_10_DONTCALL,11,Goto(s,12)
+exten => sw_10_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_10_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_9]
@@ -252,24 +261,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-11-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_9-11)
-exten => s,12,Return()
-exten => _sw-11-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-11-ANSWER,10,Goto(s,11)
-exten => sw-11-BUSY,10,Voicemail(b${ext})
-exten => sw-11-BUSY,11,Goto(s,11)
-exten => sw-11-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-11-DONTCALL,11,Goto(s,11)
-exten => sw-11-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-11-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_11_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_9_11)
+exten => s,13,Return()
+exten => _sw_11_.,10,Voicemail(u${ext})
+exten => _sw_11_.,11,Goto(s,12)
+exten => sw_11_,10,Goto(sw_11_.,10)
+exten => sw_11_NOANSWER,10,Voicemail(u${ext})
+exten => sw_11_NOANSWER,11,Goto(s,12)
+exten => sw_11_ANSWER,10,Goto(s,12)
+exten => sw_11_BUSY,10,Voicemail(b${ext})
+exten => sw_11_BUSY,11,Goto(s,12)
+exten => sw_11_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_11_DONTCALL,11,Goto(s,12)
+exten => sw_11_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_11_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_10]
@@ -279,24 +289,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-12-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_10-12)
-exten => s,12,Return()
-exten => _sw-12-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-12-ANSWER,10,Goto(s,11)
-exten => sw-12-BUSY,10,Voicemail(b${ext})
-exten => sw-12-BUSY,11,Goto(s,11)
-exten => sw-12-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-12-DONTCALL,11,Goto(s,11)
-exten => sw-12-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-12-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_12_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_10_12)
+exten => s,13,Return()
+exten => _sw_12_.,10,Voicemail(u${ext})
+exten => _sw_12_.,11,Goto(s,12)
+exten => sw_12_,10,Goto(sw_12_.,10)
+exten => sw_12_NOANSWER,10,Voicemail(u${ext})
+exten => sw_12_NOANSWER,11,Goto(s,12)
+exten => sw_12_ANSWER,10,Goto(s,12)
+exten => sw_12_BUSY,10,Voicemail(b${ext})
+exten => sw_12_BUSY,11,Goto(s,12)
+exten => sw_12_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_12_DONTCALL,11,Goto(s,12)
+exten => sw_12_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_12_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_11]
@@ -306,24 +317,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-13-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_11-13)
-exten => s,12,Return()
-exten => _sw-13-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-13-ANSWER,10,Goto(s,11)
-exten => sw-13-BUSY,10,Voicemail(b${ext})
-exten => sw-13-BUSY,11,Goto(s,11)
-exten => sw-13-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-13-DONTCALL,11,Goto(s,11)
-exten => sw-13-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-13-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_13_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_11_13)
+exten => s,13,Return()
+exten => _sw_13_.,10,Voicemail(u${ext})
+exten => _sw_13_.,11,Goto(s,12)
+exten => sw_13_,10,Goto(sw_13_.,10)
+exten => sw_13_NOANSWER,10,Voicemail(u${ext})
+exten => sw_13_NOANSWER,11,Goto(s,12)
+exten => sw_13_ANSWER,10,Goto(s,12)
+exten => sw_13_BUSY,10,Voicemail(b${ext})
+exten => sw_13_BUSY,11,Goto(s,12)
+exten => sw_13_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_13_DONTCALL,11,Goto(s,12)
+exten => sw_13_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_13_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_12]
@@ -333,24 +345,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-14-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_12-14)
-exten => s,12,Return()
-exten => _sw-14-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-14-ANSWER,10,Goto(s,11)
-exten => sw-14-BUSY,10,Voicemail(b${ext})
-exten => sw-14-BUSY,11,Goto(s,11)
-exten => sw-14-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-14-DONTCALL,11,Goto(s,11)
-exten => sw-14-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-14-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_14_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_12_14)
+exten => s,13,Return()
+exten => _sw_14_.,10,Voicemail(u${ext})
+exten => _sw_14_.,11,Goto(s,12)
+exten => sw_14_,10,Goto(sw_14_.,10)
+exten => sw_14_NOANSWER,10,Voicemail(u${ext})
+exten => sw_14_NOANSWER,11,Goto(s,12)
+exten => sw_14_ANSWER,10,Goto(s,12)
+exten => sw_14_BUSY,10,Voicemail(b${ext})
+exten => sw_14_BUSY,11,Goto(s,12)
+exten => sw_14_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_14_DONTCALL,11,Goto(s,12)
+exten => sw_14_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_14_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_13]
@@ -360,24 +373,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-15-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_13-15)
-exten => s,12,Return()
-exten => _sw-15-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-15-ANSWER,10,Goto(s,11)
-exten => sw-15-BUSY,10,Voicemail(b${ext})
-exten => sw-15-BUSY,11,Goto(s,11)
-exten => sw-15-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-15-DONTCALL,11,Goto(s,11)
-exten => sw-15-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-15-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_15_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_13_15)
+exten => s,13,Return()
+exten => _sw_15_.,10,Voicemail(u${ext})
+exten => _sw_15_.,11,Goto(s,12)
+exten => sw_15_,10,Goto(sw_15_.,10)
+exten => sw_15_NOANSWER,10,Voicemail(u${ext})
+exten => sw_15_NOANSWER,11,Goto(s,12)
+exten => sw_15_ANSWER,10,Goto(s,12)
+exten => sw_15_BUSY,10,Voicemail(b${ext})
+exten => sw_15_BUSY,11,Goto(s,12)
+exten => sw_15_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_15_DONTCALL,11,Goto(s,12)
+exten => sw_15_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_15_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_14]
@@ -387,24 +401,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-16-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_14-16)
-exten => s,12,Return()
-exten => _sw-16-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-16-ANSWER,10,Goto(s,11)
-exten => sw-16-BUSY,10,Voicemail(b${ext})
-exten => sw-16-BUSY,11,Goto(s,11)
-exten => sw-16-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-16-DONTCALL,11,Goto(s,11)
-exten => sw-16-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-16-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_16_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_14_16)
+exten => s,13,Return()
+exten => _sw_16_.,10,Voicemail(u${ext})
+exten => _sw_16_.,11,Goto(s,12)
+exten => sw_16_,10,Goto(sw_16_.,10)
+exten => sw_16_NOANSWER,10,Voicemail(u${ext})
+exten => sw_16_NOANSWER,11,Goto(s,12)
+exten => sw_16_ANSWER,10,Goto(s,12)
+exten => sw_16_BUSY,10,Voicemail(b${ext})
+exten => sw_16_BUSY,11,Goto(s,12)
+exten => sw_16_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_16_DONTCALL,11,Goto(s,12)
+exten => sw_16_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_16_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_15]
@@ -414,24 +429,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-17-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_15-17)
-exten => s,12,Return()
-exten => _sw-17-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-17-ANSWER,10,Goto(s,11)
-exten => sw-17-BUSY,10,Voicemail(b${ext})
-exten => sw-17-BUSY,11,Goto(s,11)
-exten => sw-17-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-17-DONTCALL,11,Goto(s,11)
-exten => sw-17-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-17-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_17_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_15_17)
+exten => s,13,Return()
+exten => _sw_17_.,10,Voicemail(u${ext})
+exten => _sw_17_.,11,Goto(s,12)
+exten => sw_17_,10,Goto(sw_17_.,10)
+exten => sw_17_NOANSWER,10,Voicemail(u${ext})
+exten => sw_17_NOANSWER,11,Goto(s,12)
+exten => sw_17_ANSWER,10,Goto(s,12)
+exten => sw_17_BUSY,10,Voicemail(b${ext})
+exten => sw_17_BUSY,11,Goto(s,12)
+exten => sw_17_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_17_DONTCALL,11,Goto(s,12)
+exten => sw_17_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_17_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_16]
@@ -441,24 +457,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-18-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_16-18)
-exten => s,12,Return()
-exten => _sw-18-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-18-ANSWER,10,Goto(s,11)
-exten => sw-18-BUSY,10,Voicemail(b${ext})
-exten => sw-18-BUSY,11,Goto(s,11)
-exten => sw-18-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-18-DONTCALL,11,Goto(s,11)
-exten => sw-18-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-18-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_18_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_16_18)
+exten => s,13,Return()
+exten => _sw_18_.,10,Voicemail(u${ext})
+exten => _sw_18_.,11,Goto(s,12)
+exten => sw_18_,10,Goto(sw_18_.,10)
+exten => sw_18_NOANSWER,10,Voicemail(u${ext})
+exten => sw_18_NOANSWER,11,Goto(s,12)
+exten => sw_18_ANSWER,10,Goto(s,12)
+exten => sw_18_BUSY,10,Voicemail(b${ext})
+exten => sw_18_BUSY,11,Goto(s,12)
+exten => sw_18_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_18_DONTCALL,11,Goto(s,12)
+exten => sw_18_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_18_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_17]
@@ -468,24 +485,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-19-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_17-19)
-exten => s,12,Return()
-exten => _sw-19-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-19-ANSWER,10,Goto(s,11)
-exten => sw-19-BUSY,10,Voicemail(b${ext})
-exten => sw-19-BUSY,11,Goto(s,11)
-exten => sw-19-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-19-DONTCALL,11,Goto(s,11)
-exten => sw-19-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-19-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_19_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_17_19)
+exten => s,13,Return()
+exten => _sw_19_.,10,Voicemail(u${ext})
+exten => _sw_19_.,11,Goto(s,12)
+exten => sw_19_,10,Goto(sw_19_.,10)
+exten => sw_19_NOANSWER,10,Voicemail(u${ext})
+exten => sw_19_NOANSWER,11,Goto(s,12)
+exten => sw_19_ANSWER,10,Goto(s,12)
+exten => sw_19_BUSY,10,Voicemail(b${ext})
+exten => sw_19_BUSY,11,Goto(s,12)
+exten => sw_19_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_19_DONTCALL,11,Goto(s,12)
+exten => sw_19_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_19_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_18]
@@ -495,24 +513,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-20-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_18-20)
-exten => s,12,Return()
-exten => _sw-20-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-20-ANSWER,10,Goto(s,11)
-exten => sw-20-BUSY,10,Voicemail(b${ext})
-exten => sw-20-BUSY,11,Goto(s,11)
-exten => sw-20-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-20-DONTCALL,11,Goto(s,11)
-exten => sw-20-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-20-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_20_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_18_20)
+exten => s,13,Return()
+exten => _sw_20_.,10,Voicemail(u${ext})
+exten => _sw_20_.,11,Goto(s,12)
+exten => sw_20_,10,Goto(sw_20_.,10)
+exten => sw_20_NOANSWER,10,Voicemail(u${ext})
+exten => sw_20_NOANSWER,11,Goto(s,12)
+exten => sw_20_ANSWER,10,Goto(s,12)
+exten => sw_20_BUSY,10,Voicemail(b${ext})
+exten => sw_20_BUSY,11,Goto(s,12)
+exten => sw_20_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_20_DONTCALL,11,Goto(s,12)
+exten => sw_20_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_20_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_19]
@@ -522,24 +541,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-21-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_19-21)
-exten => s,12,Return()
-exten => _sw-21-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-21-ANSWER,10,Goto(s,11)
-exten => sw-21-BUSY,10,Voicemail(b${ext})
-exten => sw-21-BUSY,11,Goto(s,11)
-exten => sw-21-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-21-DONTCALL,11,Goto(s,11)
-exten => sw-21-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-21-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_21_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_19_21)
+exten => s,13,Return()
+exten => _sw_21_.,10,Voicemail(u${ext})
+exten => _sw_21_.,11,Goto(s,12)
+exten => sw_21_,10,Goto(sw_21_.,10)
+exten => sw_21_NOANSWER,10,Voicemail(u${ext})
+exten => sw_21_NOANSWER,11,Goto(s,12)
+exten => sw_21_ANSWER,10,Goto(s,12)
+exten => sw_21_BUSY,10,Voicemail(b${ext})
+exten => sw_21_BUSY,11,Goto(s,12)
+exten => sw_21_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_21_DONTCALL,11,Goto(s,12)
+exten => sw_21_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_21_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_20]
@@ -549,24 +569,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-22-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_20-22)
-exten => s,12,Return()
-exten => _sw-22-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-22-ANSWER,10,Goto(s,11)
-exten => sw-22-BUSY,10,Voicemail(b${ext})
-exten => sw-22-BUSY,11,Goto(s,11)
-exten => sw-22-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-22-DONTCALL,11,Goto(s,11)
-exten => sw-22-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-22-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_22_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_20_22)
+exten => s,13,Return()
+exten => _sw_22_.,10,Voicemail(u${ext})
+exten => _sw_22_.,11,Goto(s,12)
+exten => sw_22_,10,Goto(sw_22_.,10)
+exten => sw_22_NOANSWER,10,Voicemail(u${ext})
+exten => sw_22_NOANSWER,11,Goto(s,12)
+exten => sw_22_ANSWER,10,Goto(s,12)
+exten => sw_22_BUSY,10,Voicemail(b${ext})
+exten => sw_22_BUSY,11,Goto(s,12)
+exten => sw_22_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_22_DONTCALL,11,Goto(s,12)
+exten => sw_22_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_22_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_21]
@@ -576,24 +597,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-23-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_21-23)
-exten => s,12,Return()
-exten => _sw-23-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-23-ANSWER,10,Goto(s,11)
-exten => sw-23-BUSY,10,Voicemail(b${ext})
-exten => sw-23-BUSY,11,Goto(s,11)
-exten => sw-23-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-23-DONTCALL,11,Goto(s,11)
-exten => sw-23-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-23-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_23_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_21_23)
+exten => s,13,Return()
+exten => _sw_23_.,10,Voicemail(u${ext})
+exten => _sw_23_.,11,Goto(s,12)
+exten => sw_23_,10,Goto(sw_23_.,10)
+exten => sw_23_NOANSWER,10,Voicemail(u${ext})
+exten => sw_23_NOANSWER,11,Goto(s,12)
+exten => sw_23_ANSWER,10,Goto(s,12)
+exten => sw_23_BUSY,10,Voicemail(b${ext})
+exten => sw_23_BUSY,11,Goto(s,12)
+exten => sw_23_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_23_DONTCALL,11,Goto(s,12)
+exten => sw_23_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_23_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_22]
@@ -603,24 +625,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-24-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_22-24)
-exten => s,12,Return()
-exten => _sw-24-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-24-ANSWER,10,Goto(s,11)
-exten => sw-24-BUSY,10,Voicemail(b${ext})
-exten => sw-24-BUSY,11,Goto(s,11)
-exten => sw-24-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-24-DONTCALL,11,Goto(s,11)
-exten => sw-24-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-24-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_24_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_22_24)
+exten => s,13,Return()
+exten => _sw_24_.,10,Voicemail(u${ext})
+exten => _sw_24_.,11,Goto(s,12)
+exten => sw_24_,10,Goto(sw_24_.,10)
+exten => sw_24_NOANSWER,10,Voicemail(u${ext})
+exten => sw_24_NOANSWER,11,Goto(s,12)
+exten => sw_24_ANSWER,10,Goto(s,12)
+exten => sw_24_BUSY,10,Voicemail(b${ext})
+exten => sw_24_BUSY,11,Goto(s,12)
+exten => sw_24_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_24_DONTCALL,11,Goto(s,12)
+exten => sw_24_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_24_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_23]
@@ -630,24 +653,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-25-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_23-25)
-exten => s,12,Return()
-exten => _sw-25-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-25-ANSWER,10,Goto(s,11)
-exten => sw-25-BUSY,10,Voicemail(b${ext})
-exten => sw-25-BUSY,11,Goto(s,11)
-exten => sw-25-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-25-DONTCALL,11,Goto(s,11)
-exten => sw-25-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-25-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_25_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_23_25)
+exten => s,13,Return()
+exten => _sw_25_.,10,Voicemail(u${ext})
+exten => _sw_25_.,11,Goto(s,12)
+exten => sw_25_,10,Goto(sw_25_.,10)
+exten => sw_25_NOANSWER,10,Voicemail(u${ext})
+exten => sw_25_NOANSWER,11,Goto(s,12)
+exten => sw_25_ANSWER,10,Goto(s,12)
+exten => sw_25_BUSY,10,Voicemail(b${ext})
+exten => sw_25_BUSY,11,Goto(s,12)
+exten => sw_25_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_25_DONTCALL,11,Goto(s,12)
+exten => sw_25_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_25_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_24]
@@ -657,24 +681,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-26-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_24-26)
-exten => s,12,Return()
-exten => _sw-26-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-26-ANSWER,10,Goto(s,11)
-exten => sw-26-BUSY,10,Voicemail(b${ext})
-exten => sw-26-BUSY,11,Goto(s,11)
-exten => sw-26-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-26-DONTCALL,11,Goto(s,11)
-exten => sw-26-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-26-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_26_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_24_26)
+exten => s,13,Return()
+exten => _sw_26_.,10,Voicemail(u${ext})
+exten => _sw_26_.,11,Goto(s,12)
+exten => sw_26_,10,Goto(sw_26_.,10)
+exten => sw_26_NOANSWER,10,Voicemail(u${ext})
+exten => sw_26_NOANSWER,11,Goto(s,12)
+exten => sw_26_ANSWER,10,Goto(s,12)
+exten => sw_26_BUSY,10,Voicemail(b${ext})
+exten => sw_26_BUSY,11,Goto(s,12)
+exten => sw_26_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_26_DONTCALL,11,Goto(s,12)
+exten => sw_26_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_26_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_25]
@@ -684,24 +709,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-27-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_25-27)
-exten => s,12,Return()
-exten => _sw-27-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-27-ANSWER,10,Goto(s,11)
-exten => sw-27-BUSY,10,Voicemail(b${ext})
-exten => sw-27-BUSY,11,Goto(s,11)
-exten => sw-27-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-27-DONTCALL,11,Goto(s,11)
-exten => sw-27-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-27-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_27_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_25_27)
+exten => s,13,Return()
+exten => _sw_27_.,10,Voicemail(u${ext})
+exten => _sw_27_.,11,Goto(s,12)
+exten => sw_27_,10,Goto(sw_27_.,10)
+exten => sw_27_NOANSWER,10,Voicemail(u${ext})
+exten => sw_27_NOANSWER,11,Goto(s,12)
+exten => sw_27_ANSWER,10,Goto(s,12)
+exten => sw_27_BUSY,10,Voicemail(b${ext})
+exten => sw_27_BUSY,11,Goto(s,12)
+exten => sw_27_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_27_DONTCALL,11,Goto(s,12)
+exten => sw_27_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_27_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_26]
@@ -711,24 +737,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-28-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_26-28)
-exten => s,12,Return()
-exten => _sw-28-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-28-ANSWER,10,Goto(s,11)
-exten => sw-28-BUSY,10,Voicemail(b${ext})
-exten => sw-28-BUSY,11,Goto(s,11)
-exten => sw-28-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-28-DONTCALL,11,Goto(s,11)
-exten => sw-28-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-28-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_28_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_26_28)
+exten => s,13,Return()
+exten => _sw_28_.,10,Voicemail(u${ext})
+exten => _sw_28_.,11,Goto(s,12)
+exten => sw_28_,10,Goto(sw_28_.,10)
+exten => sw_28_NOANSWER,10,Voicemail(u${ext})
+exten => sw_28_NOANSWER,11,Goto(s,12)
+exten => sw_28_ANSWER,10,Goto(s,12)
+exten => sw_28_BUSY,10,Voicemail(b${ext})
+exten => sw_28_BUSY,11,Goto(s,12)
+exten => sw_28_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_28_DONTCALL,11,Goto(s,12)
+exten => sw_28_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_28_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_27]
@@ -738,24 +765,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-29-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_27-29)
-exten => s,12,Return()
-exten => _sw-29-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-29-ANSWER,10,Goto(s,11)
-exten => sw-29-BUSY,10,Voicemail(b${ext})
-exten => sw-29-BUSY,11,Goto(s,11)
-exten => sw-29-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-29-DONTCALL,11,Goto(s,11)
-exten => sw-29-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-29-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_29_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_27_29)
+exten => s,13,Return()
+exten => _sw_29_.,10,Voicemail(u${ext})
+exten => _sw_29_.,11,Goto(s,12)
+exten => sw_29_,10,Goto(sw_29_.,10)
+exten => sw_29_NOANSWER,10,Voicemail(u${ext})
+exten => sw_29_NOANSWER,11,Goto(s,12)
+exten => sw_29_ANSWER,10,Goto(s,12)
+exten => sw_29_BUSY,10,Voicemail(b${ext})
+exten => sw_29_BUSY,11,Goto(s,12)
+exten => sw_29_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_29_DONTCALL,11,Goto(s,12)
+exten => sw_29_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_29_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_28]
@@ -765,24 +793,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-30-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_28-30)
-exten => s,12,Return()
-exten => _sw-30-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-30-ANSWER,10,Goto(s,11)
-exten => sw-30-BUSY,10,Voicemail(b${ext})
-exten => sw-30-BUSY,11,Goto(s,11)
-exten => sw-30-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-30-DONTCALL,11,Goto(s,11)
-exten => sw-30-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-30-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_30_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_28_30)
+exten => s,13,Return()
+exten => _sw_30_.,10,Voicemail(u${ext})
+exten => _sw_30_.,11,Goto(s,12)
+exten => sw_30_,10,Goto(sw_30_.,10)
+exten => sw_30_NOANSWER,10,Voicemail(u${ext})
+exten => sw_30_NOANSWER,11,Goto(s,12)
+exten => sw_30_ANSWER,10,Goto(s,12)
+exten => sw_30_BUSY,10,Voicemail(b${ext})
+exten => sw_30_BUSY,11,Goto(s,12)
+exten => sw_30_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_30_DONTCALL,11,Goto(s,12)
+exten => sw_30_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_30_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_29]
@@ -792,24 +821,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-31-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_29-31)
-exten => s,12,Return()
-exten => _sw-31-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-31-ANSWER,10,Goto(s,11)
-exten => sw-31-BUSY,10,Voicemail(b${ext})
-exten => sw-31-BUSY,11,Goto(s,11)
-exten => sw-31-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-31-DONTCALL,11,Goto(s,11)
-exten => sw-31-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-31-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_31_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_29_31)
+exten => s,13,Return()
+exten => _sw_31_.,10,Voicemail(u${ext})
+exten => _sw_31_.,11,Goto(s,12)
+exten => sw_31_,10,Goto(sw_31_.,10)
+exten => sw_31_NOANSWER,10,Voicemail(u${ext})
+exten => sw_31_NOANSWER,11,Goto(s,12)
+exten => sw_31_ANSWER,10,Goto(s,12)
+exten => sw_31_BUSY,10,Voicemail(b${ext})
+exten => sw_31_BUSY,11,Goto(s,12)
+exten => sw_31_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_31_DONTCALL,11,Goto(s,12)
+exten => sw_31_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_31_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_30]
@@ -819,24 +849,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-32-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_30-32)
-exten => s,12,Return()
-exten => _sw-32-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-32-ANSWER,10,Goto(s,11)
-exten => sw-32-BUSY,10,Voicemail(b${ext})
-exten => sw-32-BUSY,11,Goto(s,11)
-exten => sw-32-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-32-DONTCALL,11,Goto(s,11)
-exten => sw-32-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-32-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_32_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_30_32)
+exten => s,13,Return()
+exten => _sw_32_.,10,Voicemail(u${ext})
+exten => _sw_32_.,11,Goto(s,12)
+exten => sw_32_,10,Goto(sw_32_.,10)
+exten => sw_32_NOANSWER,10,Voicemail(u${ext})
+exten => sw_32_NOANSWER,11,Goto(s,12)
+exten => sw_32_ANSWER,10,Goto(s,12)
+exten => sw_32_BUSY,10,Voicemail(b${ext})
+exten => sw_32_BUSY,11,Goto(s,12)
+exten => sw_32_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_32_DONTCALL,11,Goto(s,12)
+exten => sw_32_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_32_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_31]
@@ -846,24 +877,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-33-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_31-33)
-exten => s,12,Return()
-exten => _sw-33-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-33-ANSWER,10,Goto(s,11)
-exten => sw-33-BUSY,10,Voicemail(b${ext})
-exten => sw-33-BUSY,11,Goto(s,11)
-exten => sw-33-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-33-DONTCALL,11,Goto(s,11)
-exten => sw-33-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-33-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_33_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_31_33)
+exten => s,13,Return()
+exten => _sw_33_.,10,Voicemail(u${ext})
+exten => _sw_33_.,11,Goto(s,12)
+exten => sw_33_,10,Goto(sw_33_.,10)
+exten => sw_33_NOANSWER,10,Voicemail(u${ext})
+exten => sw_33_NOANSWER,11,Goto(s,12)
+exten => sw_33_ANSWER,10,Goto(s,12)
+exten => sw_33_BUSY,10,Voicemail(b${ext})
+exten => sw_33_BUSY,11,Goto(s,12)
+exten => sw_33_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_33_DONTCALL,11,Goto(s,12)
+exten => sw_33_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_33_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_32]
@@ -873,24 +905,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-34-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_32-34)
-exten => s,12,Return()
-exten => _sw-34-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-34-ANSWER,10,Goto(s,11)
-exten => sw-34-BUSY,10,Voicemail(b${ext})
-exten => sw-34-BUSY,11,Goto(s,11)
-exten => sw-34-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-34-DONTCALL,11,Goto(s,11)
-exten => sw-34-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-34-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_34_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_32_34)
+exten => s,13,Return()
+exten => _sw_34_.,10,Voicemail(u${ext})
+exten => _sw_34_.,11,Goto(s,12)
+exten => sw_34_,10,Goto(sw_34_.,10)
+exten => sw_34_NOANSWER,10,Voicemail(u${ext})
+exten => sw_34_NOANSWER,11,Goto(s,12)
+exten => sw_34_ANSWER,10,Goto(s,12)
+exten => sw_34_BUSY,10,Voicemail(b${ext})
+exten => sw_34_BUSY,11,Goto(s,12)
+exten => sw_34_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_34_DONTCALL,11,Goto(s,12)
+exten => sw_34_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_34_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_33]
@@ -900,24 +933,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-35-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_33-35)
-exten => s,12,Return()
-exten => _sw-35-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-35-ANSWER,10,Goto(s,11)
-exten => sw-35-BUSY,10,Voicemail(b${ext})
-exten => sw-35-BUSY,11,Goto(s,11)
-exten => sw-35-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-35-DONTCALL,11,Goto(s,11)
-exten => sw-35-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-35-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_35_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_33_35)
+exten => s,13,Return()
+exten => _sw_35_.,10,Voicemail(u${ext})
+exten => _sw_35_.,11,Goto(s,12)
+exten => sw_35_,10,Goto(sw_35_.,10)
+exten => sw_35_NOANSWER,10,Voicemail(u${ext})
+exten => sw_35_NOANSWER,11,Goto(s,12)
+exten => sw_35_ANSWER,10,Goto(s,12)
+exten => sw_35_BUSY,10,Voicemail(b${ext})
+exten => sw_35_BUSY,11,Goto(s,12)
+exten => sw_35_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_35_DONTCALL,11,Goto(s,12)
+exten => sw_35_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_35_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_34]
@@ -927,24 +961,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-36-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_34-36)
-exten => s,12,Return()
-exten => _sw-36-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-36-ANSWER,10,Goto(s,11)
-exten => sw-36-BUSY,10,Voicemail(b${ext})
-exten => sw-36-BUSY,11,Goto(s,11)
-exten => sw-36-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-36-DONTCALL,11,Goto(s,11)
-exten => sw-36-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-36-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_36_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_34_36)
+exten => s,13,Return()
+exten => _sw_36_.,10,Voicemail(u${ext})
+exten => _sw_36_.,11,Goto(s,12)
+exten => sw_36_,10,Goto(sw_36_.,10)
+exten => sw_36_NOANSWER,10,Voicemail(u${ext})
+exten => sw_36_NOANSWER,11,Goto(s,12)
+exten => sw_36_ANSWER,10,Goto(s,12)
+exten => sw_36_BUSY,10,Voicemail(b${ext})
+exten => sw_36_BUSY,11,Goto(s,12)
+exten => sw_36_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_36_DONTCALL,11,Goto(s,12)
+exten => sw_36_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_36_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_35]
@@ -954,24 +989,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-37-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_35-37)
-exten => s,12,Return()
-exten => _sw-37-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-37-ANSWER,10,Goto(s,11)
-exten => sw-37-BUSY,10,Voicemail(b${ext})
-exten => sw-37-BUSY,11,Goto(s,11)
-exten => sw-37-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-37-DONTCALL,11,Goto(s,11)
-exten => sw-37-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-37-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_37_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_35_37)
+exten => s,13,Return()
+exten => _sw_37_.,10,Voicemail(u${ext})
+exten => _sw_37_.,11,Goto(s,12)
+exten => sw_37_,10,Goto(sw_37_.,10)
+exten => sw_37_NOANSWER,10,Voicemail(u${ext})
+exten => sw_37_NOANSWER,11,Goto(s,12)
+exten => sw_37_ANSWER,10,Goto(s,12)
+exten => sw_37_BUSY,10,Voicemail(b${ext})
+exten => sw_37_BUSY,11,Goto(s,12)
+exten => sw_37_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_37_DONTCALL,11,Goto(s,12)
+exten => sw_37_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_37_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_36]
@@ -981,24 +1017,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-38-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_36-38)
-exten => s,12,Return()
-exten => _sw-38-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-38-ANSWER,10,Goto(s,11)
-exten => sw-38-BUSY,10,Voicemail(b${ext})
-exten => sw-38-BUSY,11,Goto(s,11)
-exten => sw-38-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-38-DONTCALL,11,Goto(s,11)
-exten => sw-38-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-38-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_38_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_36_38)
+exten => s,13,Return()
+exten => _sw_38_.,10,Voicemail(u${ext})
+exten => _sw_38_.,11,Goto(s,12)
+exten => sw_38_,10,Goto(sw_38_.,10)
+exten => sw_38_NOANSWER,10,Voicemail(u${ext})
+exten => sw_38_NOANSWER,11,Goto(s,12)
+exten => sw_38_ANSWER,10,Goto(s,12)
+exten => sw_38_BUSY,10,Voicemail(b${ext})
+exten => sw_38_BUSY,11,Goto(s,12)
+exten => sw_38_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_38_DONTCALL,11,Goto(s,12)
+exten => sw_38_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_38_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_37]
@@ -1008,24 +1045,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-39-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_37-39)
-exten => s,12,Return()
-exten => _sw-39-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-39-ANSWER,10,Goto(s,11)
-exten => sw-39-BUSY,10,Voicemail(b${ext})
-exten => sw-39-BUSY,11,Goto(s,11)
-exten => sw-39-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-39-DONTCALL,11,Goto(s,11)
-exten => sw-39-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-39-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_39_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_37_39)
+exten => s,13,Return()
+exten => _sw_39_.,10,Voicemail(u${ext})
+exten => _sw_39_.,11,Goto(s,12)
+exten => sw_39_,10,Goto(sw_39_.,10)
+exten => sw_39_NOANSWER,10,Voicemail(u${ext})
+exten => sw_39_NOANSWER,11,Goto(s,12)
+exten => sw_39_ANSWER,10,Goto(s,12)
+exten => sw_39_BUSY,10,Voicemail(b${ext})
+exten => sw_39_BUSY,11,Goto(s,12)
+exten => sw_39_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_39_DONTCALL,11,Goto(s,12)
+exten => sw_39_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_39_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_38]
@@ -1035,24 +1073,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-40-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_38-40)
-exten => s,12,Return()
-exten => _sw-40-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-40-ANSWER,10,Goto(s,11)
-exten => sw-40-BUSY,10,Voicemail(b${ext})
-exten => sw-40-BUSY,11,Goto(s,11)
-exten => sw-40-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-40-DONTCALL,11,Goto(s,11)
-exten => sw-40-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-40-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_40_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_38_40)
+exten => s,13,Return()
+exten => _sw_40_.,10,Voicemail(u${ext})
+exten => _sw_40_.,11,Goto(s,12)
+exten => sw_40_,10,Goto(sw_40_.,10)
+exten => sw_40_NOANSWER,10,Voicemail(u${ext})
+exten => sw_40_NOANSWER,11,Goto(s,12)
+exten => sw_40_ANSWER,10,Goto(s,12)
+exten => sw_40_BUSY,10,Voicemail(b${ext})
+exten => sw_40_BUSY,11,Goto(s,12)
+exten => sw_40_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_40_DONTCALL,11,Goto(s,12)
+exten => sw_40_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_40_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_39]
@@ -1062,24 +1101,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-41-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_39-41)
-exten => s,12,Return()
-exten => _sw-41-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-41-ANSWER,10,Goto(s,11)
-exten => sw-41-BUSY,10,Voicemail(b${ext})
-exten => sw-41-BUSY,11,Goto(s,11)
-exten => sw-41-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-41-DONTCALL,11,Goto(s,11)
-exten => sw-41-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-41-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_41_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_39_41)
+exten => s,13,Return()
+exten => _sw_41_.,10,Voicemail(u${ext})
+exten => _sw_41_.,11,Goto(s,12)
+exten => sw_41_,10,Goto(sw_41_.,10)
+exten => sw_41_NOANSWER,10,Voicemail(u${ext})
+exten => sw_41_NOANSWER,11,Goto(s,12)
+exten => sw_41_ANSWER,10,Goto(s,12)
+exten => sw_41_BUSY,10,Voicemail(b${ext})
+exten => sw_41_BUSY,11,Goto(s,12)
+exten => sw_41_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_41_DONTCALL,11,Goto(s,12)
+exten => sw_41_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_41_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_40]
@@ -1089,24 +1129,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-42-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_40-42)
-exten => s,12,Return()
-exten => _sw-42-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-42-ANSWER,10,Goto(s,11)
-exten => sw-42-BUSY,10,Voicemail(b${ext})
-exten => sw-42-BUSY,11,Goto(s,11)
-exten => sw-42-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-42-DONTCALL,11,Goto(s,11)
-exten => sw-42-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-42-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_42_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_40_42)
+exten => s,13,Return()
+exten => _sw_42_.,10,Voicemail(u${ext})
+exten => _sw_42_.,11,Goto(s,12)
+exten => sw_42_,10,Goto(sw_42_.,10)
+exten => sw_42_NOANSWER,10,Voicemail(u${ext})
+exten => sw_42_NOANSWER,11,Goto(s,12)
+exten => sw_42_ANSWER,10,Goto(s,12)
+exten => sw_42_BUSY,10,Voicemail(b${ext})
+exten => sw_42_BUSY,11,Goto(s,12)
+exten => sw_42_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_42_DONTCALL,11,Goto(s,12)
+exten => sw_42_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_42_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_41]
@@ -1116,24 +1157,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-43-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_41-43)
-exten => s,12,Return()
-exten => _sw-43-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-43-ANSWER,10,Goto(s,11)
-exten => sw-43-BUSY,10,Voicemail(b${ext})
-exten => sw-43-BUSY,11,Goto(s,11)
-exten => sw-43-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-43-DONTCALL,11,Goto(s,11)
-exten => sw-43-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-43-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_43_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_41_43)
+exten => s,13,Return()
+exten => _sw_43_.,10,Voicemail(u${ext})
+exten => _sw_43_.,11,Goto(s,12)
+exten => sw_43_,10,Goto(sw_43_.,10)
+exten => sw_43_NOANSWER,10,Voicemail(u${ext})
+exten => sw_43_NOANSWER,11,Goto(s,12)
+exten => sw_43_ANSWER,10,Goto(s,12)
+exten => sw_43_BUSY,10,Voicemail(b${ext})
+exten => sw_43_BUSY,11,Goto(s,12)
+exten => sw_43_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_43_DONTCALL,11,Goto(s,12)
+exten => sw_43_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_43_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_42]
@@ -1143,24 +1185,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-44-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_42-44)
-exten => s,12,Return()
-exten => _sw-44-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-44-ANSWER,10,Goto(s,11)
-exten => sw-44-BUSY,10,Voicemail(b${ext})
-exten => sw-44-BUSY,11,Goto(s,11)
-exten => sw-44-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-44-DONTCALL,11,Goto(s,11)
-exten => sw-44-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-44-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_44_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_42_44)
+exten => s,13,Return()
+exten => _sw_44_.,10,Voicemail(u${ext})
+exten => _sw_44_.,11,Goto(s,12)
+exten => sw_44_,10,Goto(sw_44_.,10)
+exten => sw_44_NOANSWER,10,Voicemail(u${ext})
+exten => sw_44_NOANSWER,11,Goto(s,12)
+exten => sw_44_ANSWER,10,Goto(s,12)
+exten => sw_44_BUSY,10,Voicemail(b${ext})
+exten => sw_44_BUSY,11,Goto(s,12)
+exten => sw_44_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_44_DONTCALL,11,Goto(s,12)
+exten => sw_44_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_44_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_43]
@@ -1170,24 +1213,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-45-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_43-45)
-exten => s,12,Return()
-exten => _sw-45-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-45-ANSWER,10,Goto(s,11)
-exten => sw-45-BUSY,10,Voicemail(b${ext})
-exten => sw-45-BUSY,11,Goto(s,11)
-exten => sw-45-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-45-DONTCALL,11,Goto(s,11)
-exten => sw-45-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-45-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_45_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_43_45)
+exten => s,13,Return()
+exten => _sw_45_.,10,Voicemail(u${ext})
+exten => _sw_45_.,11,Goto(s,12)
+exten => sw_45_,10,Goto(sw_45_.,10)
+exten => sw_45_NOANSWER,10,Voicemail(u${ext})
+exten => sw_45_NOANSWER,11,Goto(s,12)
+exten => sw_45_ANSWER,10,Goto(s,12)
+exten => sw_45_BUSY,10,Voicemail(b${ext})
+exten => sw_45_BUSY,11,Goto(s,12)
+exten => sw_45_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_45_DONTCALL,11,Goto(s,12)
+exten => sw_45_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_45_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_44]
@@ -1197,24 +1241,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-46-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_44-46)
-exten => s,12,Return()
-exten => _sw-46-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-46-ANSWER,10,Goto(s,11)
-exten => sw-46-BUSY,10,Voicemail(b${ext})
-exten => sw-46-BUSY,11,Goto(s,11)
-exten => sw-46-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-46-DONTCALL,11,Goto(s,11)
-exten => sw-46-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-46-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_46_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_44_46)
+exten => s,13,Return()
+exten => _sw_46_.,10,Voicemail(u${ext})
+exten => _sw_46_.,11,Goto(s,12)
+exten => sw_46_,10,Goto(sw_46_.,10)
+exten => sw_46_NOANSWER,10,Voicemail(u${ext})
+exten => sw_46_NOANSWER,11,Goto(s,12)
+exten => sw_46_ANSWER,10,Goto(s,12)
+exten => sw_46_BUSY,10,Voicemail(b${ext})
+exten => sw_46_BUSY,11,Goto(s,12)
+exten => sw_46_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_46_DONTCALL,11,Goto(s,12)
+exten => sw_46_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_46_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_45]
@@ -1224,24 +1269,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-47-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_45-47)
-exten => s,12,Return()
-exten => _sw-47-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-47-ANSWER,10,Goto(s,11)
-exten => sw-47-BUSY,10,Voicemail(b${ext})
-exten => sw-47-BUSY,11,Goto(s,11)
-exten => sw-47-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-47-DONTCALL,11,Goto(s,11)
-exten => sw-47-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-47-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_47_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_45_47)
+exten => s,13,Return()
+exten => _sw_47_.,10,Voicemail(u${ext})
+exten => _sw_47_.,11,Goto(s,12)
+exten => sw_47_,10,Goto(sw_47_.,10)
+exten => sw_47_NOANSWER,10,Voicemail(u${ext})
+exten => sw_47_NOANSWER,11,Goto(s,12)
+exten => sw_47_ANSWER,10,Goto(s,12)
+exten => sw_47_BUSY,10,Voicemail(b${ext})
+exten => sw_47_BUSY,11,Goto(s,12)
+exten => sw_47_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_47_DONTCALL,11,Goto(s,12)
+exten => sw_47_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_47_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_46]
@@ -1251,24 +1297,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-48-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_46-48)
-exten => s,12,Return()
-exten => _sw-48-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-48-ANSWER,10,Goto(s,11)
-exten => sw-48-BUSY,10,Voicemail(b${ext})
-exten => sw-48-BUSY,11,Goto(s,11)
-exten => sw-48-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-48-DONTCALL,11,Goto(s,11)
-exten => sw-48-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-48-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_48_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_46_48)
+exten => s,13,Return()
+exten => _sw_48_.,10,Voicemail(u${ext})
+exten => _sw_48_.,11,Goto(s,12)
+exten => sw_48_,10,Goto(sw_48_.,10)
+exten => sw_48_NOANSWER,10,Voicemail(u${ext})
+exten => sw_48_NOANSWER,11,Goto(s,12)
+exten => sw_48_ANSWER,10,Goto(s,12)
+exten => sw_48_BUSY,10,Voicemail(b${ext})
+exten => sw_48_BUSY,11,Goto(s,12)
+exten => sw_48_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_48_DONTCALL,11,Goto(s,12)
+exten => sw_48_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_48_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_47]
@@ -1278,24 +1325,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-49-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_47-49)
-exten => s,12,Return()
-exten => _sw-49-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-49-ANSWER,10,Goto(s,11)
-exten => sw-49-BUSY,10,Voicemail(b${ext})
-exten => sw-49-BUSY,11,Goto(s,11)
-exten => sw-49-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-49-DONTCALL,11,Goto(s,11)
-exten => sw-49-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-49-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_49_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_47_49)
+exten => s,13,Return()
+exten => _sw_49_.,10,Voicemail(u${ext})
+exten => _sw_49_.,11,Goto(s,12)
+exten => sw_49_,10,Goto(sw_49_.,10)
+exten => sw_49_NOANSWER,10,Voicemail(u${ext})
+exten => sw_49_NOANSWER,11,Goto(s,12)
+exten => sw_49_ANSWER,10,Goto(s,12)
+exten => sw_49_BUSY,10,Voicemail(b${ext})
+exten => sw_49_BUSY,11,Goto(s,12)
+exten => sw_49_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_49_DONTCALL,11,Goto(s,12)
+exten => sw_49_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_49_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_48]
@@ -1305,24 +1353,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-50-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_48-50)
-exten => s,12,Return()
-exten => _sw-50-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-50-ANSWER,10,Goto(s,11)
-exten => sw-50-BUSY,10,Voicemail(b${ext})
-exten => sw-50-BUSY,11,Goto(s,11)
-exten => sw-50-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-50-DONTCALL,11,Goto(s,11)
-exten => sw-50-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-50-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_50_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_48_50)
+exten => s,13,Return()
+exten => _sw_50_.,10,Voicemail(u${ext})
+exten => _sw_50_.,11,Goto(s,12)
+exten => sw_50_,10,Goto(sw_50_.,10)
+exten => sw_50_NOANSWER,10,Voicemail(u${ext})
+exten => sw_50_NOANSWER,11,Goto(s,12)
+exten => sw_50_ANSWER,10,Goto(s,12)
+exten => sw_50_BUSY,10,Voicemail(b${ext})
+exten => sw_50_BUSY,11,Goto(s,12)
+exten => sw_50_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_50_DONTCALL,11,Goto(s,12)
+exten => sw_50_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_50_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_49]
@@ -1332,24 +1381,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-51-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_49-51)
-exten => s,12,Return()
-exten => _sw-51-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-51-ANSWER,10,Goto(s,11)
-exten => sw-51-BUSY,10,Voicemail(b${ext})
-exten => sw-51-BUSY,11,Goto(s,11)
-exten => sw-51-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-51-DONTCALL,11,Goto(s,11)
-exten => sw-51-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-51-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_51_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_49_51)
+exten => s,13,Return()
+exten => _sw_51_.,10,Voicemail(u${ext})
+exten => _sw_51_.,11,Goto(s,12)
+exten => sw_51_,10,Goto(sw_51_.,10)
+exten => sw_51_NOANSWER,10,Voicemail(u${ext})
+exten => sw_51_NOANSWER,11,Goto(s,12)
+exten => sw_51_ANSWER,10,Goto(s,12)
+exten => sw_51_BUSY,10,Voicemail(b${ext})
+exten => sw_51_BUSY,11,Goto(s,12)
+exten => sw_51_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_51_DONTCALL,11,Goto(s,12)
+exten => sw_51_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_51_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_50]
@@ -1359,24 +1409,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-52-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_50-52)
-exten => s,12,Return()
-exten => _sw-52-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-52-ANSWER,10,Goto(s,11)
-exten => sw-52-BUSY,10,Voicemail(b${ext})
-exten => sw-52-BUSY,11,Goto(s,11)
-exten => sw-52-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-52-DONTCALL,11,Goto(s,11)
-exten => sw-52-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-52-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_52_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_50_52)
+exten => s,13,Return()
+exten => _sw_52_.,10,Voicemail(u${ext})
+exten => _sw_52_.,11,Goto(s,12)
+exten => sw_52_,10,Goto(sw_52_.,10)
+exten => sw_52_NOANSWER,10,Voicemail(u${ext})
+exten => sw_52_NOANSWER,11,Goto(s,12)
+exten => sw_52_ANSWER,10,Goto(s,12)
+exten => sw_52_BUSY,10,Voicemail(b${ext})
+exten => sw_52_BUSY,11,Goto(s,12)
+exten => sw_52_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_52_DONTCALL,11,Goto(s,12)
+exten => sw_52_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_52_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_51]
@@ -1386,24 +1437,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-53-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_51-53)
-exten => s,12,Return()
-exten => _sw-53-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-53-ANSWER,10,Goto(s,11)
-exten => sw-53-BUSY,10,Voicemail(b${ext})
-exten => sw-53-BUSY,11,Goto(s,11)
-exten => sw-53-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-53-DONTCALL,11,Goto(s,11)
-exten => sw-53-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-53-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_53_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_51_53)
+exten => s,13,Return()
+exten => _sw_53_.,10,Voicemail(u${ext})
+exten => _sw_53_.,11,Goto(s,12)
+exten => sw_53_,10,Goto(sw_53_.,10)
+exten => sw_53_NOANSWER,10,Voicemail(u${ext})
+exten => sw_53_NOANSWER,11,Goto(s,12)
+exten => sw_53_ANSWER,10,Goto(s,12)
+exten => sw_53_BUSY,10,Voicemail(b${ext})
+exten => sw_53_BUSY,11,Goto(s,12)
+exten => sw_53_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_53_DONTCALL,11,Goto(s,12)
+exten => sw_53_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_53_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_52]
@@ -1413,24 +1465,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-54-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_52-54)
-exten => s,12,Return()
-exten => _sw-54-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-54-ANSWER,10,Goto(s,11)
-exten => sw-54-BUSY,10,Voicemail(b${ext})
-exten => sw-54-BUSY,11,Goto(s,11)
-exten => sw-54-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-54-DONTCALL,11,Goto(s,11)
-exten => sw-54-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-54-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_54_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_52_54)
+exten => s,13,Return()
+exten => _sw_54_.,10,Voicemail(u${ext})
+exten => _sw_54_.,11,Goto(s,12)
+exten => sw_54_,10,Goto(sw_54_.,10)
+exten => sw_54_NOANSWER,10,Voicemail(u${ext})
+exten => sw_54_NOANSWER,11,Goto(s,12)
+exten => sw_54_ANSWER,10,Goto(s,12)
+exten => sw_54_BUSY,10,Voicemail(b${ext})
+exten => sw_54_BUSY,11,Goto(s,12)
+exten => sw_54_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_54_DONTCALL,11,Goto(s,12)
+exten => sw_54_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_54_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_53]
@@ -1440,24 +1493,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-55-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_53-55)
-exten => s,12,Return()
-exten => _sw-55-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-55-ANSWER,10,Goto(s,11)
-exten => sw-55-BUSY,10,Voicemail(b${ext})
-exten => sw-55-BUSY,11,Goto(s,11)
-exten => sw-55-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-55-DONTCALL,11,Goto(s,11)
-exten => sw-55-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-55-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_55_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_53_55)
+exten => s,13,Return()
+exten => _sw_55_.,10,Voicemail(u${ext})
+exten => _sw_55_.,11,Goto(s,12)
+exten => sw_55_,10,Goto(sw_55_.,10)
+exten => sw_55_NOANSWER,10,Voicemail(u${ext})
+exten => sw_55_NOANSWER,11,Goto(s,12)
+exten => sw_55_ANSWER,10,Goto(s,12)
+exten => sw_55_BUSY,10,Voicemail(b${ext})
+exten => sw_55_BUSY,11,Goto(s,12)
+exten => sw_55_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_55_DONTCALL,11,Goto(s,12)
+exten => sw_55_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_55_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_54]
@@ -1467,24 +1521,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-56-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_54-56)
-exten => s,12,Return()
-exten => _sw-56-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-56-ANSWER,10,Goto(s,11)
-exten => sw-56-BUSY,10,Voicemail(b${ext})
-exten => sw-56-BUSY,11,Goto(s,11)
-exten => sw-56-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-56-DONTCALL,11,Goto(s,11)
-exten => sw-56-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-56-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_56_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_54_56)
+exten => s,13,Return()
+exten => _sw_56_.,10,Voicemail(u${ext})
+exten => _sw_56_.,11,Goto(s,12)
+exten => sw_56_,10,Goto(sw_56_.,10)
+exten => sw_56_NOANSWER,10,Voicemail(u${ext})
+exten => sw_56_NOANSWER,11,Goto(s,12)
+exten => sw_56_ANSWER,10,Goto(s,12)
+exten => sw_56_BUSY,10,Voicemail(b${ext})
+exten => sw_56_BUSY,11,Goto(s,12)
+exten => sw_56_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_56_DONTCALL,11,Goto(s,12)
+exten => sw_56_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_56_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_55]
@@ -1494,24 +1549,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-57-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_55-57)
-exten => s,12,Return()
-exten => _sw-57-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-57-ANSWER,10,Goto(s,11)
-exten => sw-57-BUSY,10,Voicemail(b${ext})
-exten => sw-57-BUSY,11,Goto(s,11)
-exten => sw-57-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-57-DONTCALL,11,Goto(s,11)
-exten => sw-57-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-57-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_57_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_55_57)
+exten => s,13,Return()
+exten => _sw_57_.,10,Voicemail(u${ext})
+exten => _sw_57_.,11,Goto(s,12)
+exten => sw_57_,10,Goto(sw_57_.,10)
+exten => sw_57_NOANSWER,10,Voicemail(u${ext})
+exten => sw_57_NOANSWER,11,Goto(s,12)
+exten => sw_57_ANSWER,10,Goto(s,12)
+exten => sw_57_BUSY,10,Voicemail(b${ext})
+exten => sw_57_BUSY,11,Goto(s,12)
+exten => sw_57_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_57_DONTCALL,11,Goto(s,12)
+exten => sw_57_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_57_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_56]
@@ -1521,24 +1577,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-58-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_56-58)
-exten => s,12,Return()
-exten => _sw-58-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-58-ANSWER,10,Goto(s,11)
-exten => sw-58-BUSY,10,Voicemail(b${ext})
-exten => sw-58-BUSY,11,Goto(s,11)
-exten => sw-58-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-58-DONTCALL,11,Goto(s,11)
-exten => sw-58-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-58-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_58_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_56_58)
+exten => s,13,Return()
+exten => _sw_58_.,10,Voicemail(u${ext})
+exten => _sw_58_.,11,Goto(s,12)
+exten => sw_58_,10,Goto(sw_58_.,10)
+exten => sw_58_NOANSWER,10,Voicemail(u${ext})
+exten => sw_58_NOANSWER,11,Goto(s,12)
+exten => sw_58_ANSWER,10,Goto(s,12)
+exten => sw_58_BUSY,10,Voicemail(b${ext})
+exten => sw_58_BUSY,11,Goto(s,12)
+exten => sw_58_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_58_DONTCALL,11,Goto(s,12)
+exten => sw_58_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_58_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_57]
@@ -1548,24 +1605,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-59-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_57-59)
-exten => s,12,Return()
-exten => _sw-59-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-59-ANSWER,10,Goto(s,11)
-exten => sw-59-BUSY,10,Voicemail(b${ext})
-exten => sw-59-BUSY,11,Goto(s,11)
-exten => sw-59-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-59-DONTCALL,11,Goto(s,11)
-exten => sw-59-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-59-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_59_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_57_59)
+exten => s,13,Return()
+exten => _sw_59_.,10,Voicemail(u${ext})
+exten => _sw_59_.,11,Goto(s,12)
+exten => sw_59_,10,Goto(sw_59_.,10)
+exten => sw_59_NOANSWER,10,Voicemail(u${ext})
+exten => sw_59_NOANSWER,11,Goto(s,12)
+exten => sw_59_ANSWER,10,Goto(s,12)
+exten => sw_59_BUSY,10,Voicemail(b${ext})
+exten => sw_59_BUSY,11,Goto(s,12)
+exten => sw_59_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_59_DONTCALL,11,Goto(s,12)
+exten => sw_59_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_59_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_58]
@@ -1575,24 +1633,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-60-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_58-60)
-exten => s,12,Return()
-exten => _sw-60-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-60-ANSWER,10,Goto(s,11)
-exten => sw-60-BUSY,10,Voicemail(b${ext})
-exten => sw-60-BUSY,11,Goto(s,11)
-exten => sw-60-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-60-DONTCALL,11,Goto(s,11)
-exten => sw-60-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-60-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_60_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_58_60)
+exten => s,13,Return()
+exten => _sw_60_.,10,Voicemail(u${ext})
+exten => _sw_60_.,11,Goto(s,12)
+exten => sw_60_,10,Goto(sw_60_.,10)
+exten => sw_60_NOANSWER,10,Voicemail(u${ext})
+exten => sw_60_NOANSWER,11,Goto(s,12)
+exten => sw_60_ANSWER,10,Goto(s,12)
+exten => sw_60_BUSY,10,Voicemail(b${ext})
+exten => sw_60_BUSY,11,Goto(s,12)
+exten => sw_60_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_60_DONTCALL,11,Goto(s,12)
+exten => sw_60_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_60_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_59]
@@ -1602,24 +1661,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-61-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_59-61)
-exten => s,12,Return()
-exten => _sw-61-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-61-ANSWER,10,Goto(s,11)
-exten => sw-61-BUSY,10,Voicemail(b${ext})
-exten => sw-61-BUSY,11,Goto(s,11)
-exten => sw-61-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-61-DONTCALL,11,Goto(s,11)
-exten => sw-61-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-61-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_61_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_59_61)
+exten => s,13,Return()
+exten => _sw_61_.,10,Voicemail(u${ext})
+exten => _sw_61_.,11,Goto(s,12)
+exten => sw_61_,10,Goto(sw_61_.,10)
+exten => sw_61_NOANSWER,10,Voicemail(u${ext})
+exten => sw_61_NOANSWER,11,Goto(s,12)
+exten => sw_61_ANSWER,10,Goto(s,12)
+exten => sw_61_BUSY,10,Voicemail(b${ext})
+exten => sw_61_BUSY,11,Goto(s,12)
+exten => sw_61_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_61_DONTCALL,11,Goto(s,12)
+exten => sw_61_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_61_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_60]
@@ -1629,24 +1689,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-62-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_60-62)
-exten => s,12,Return()
-exten => _sw-62-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-62-ANSWER,10,Goto(s,11)
-exten => sw-62-BUSY,10,Voicemail(b${ext})
-exten => sw-62-BUSY,11,Goto(s,11)
-exten => sw-62-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-62-DONTCALL,11,Goto(s,11)
-exten => sw-62-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-62-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_62_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_60_62)
+exten => s,13,Return()
+exten => _sw_62_.,10,Voicemail(u${ext})
+exten => _sw_62_.,11,Goto(s,12)
+exten => sw_62_,10,Goto(sw_62_.,10)
+exten => sw_62_NOANSWER,10,Voicemail(u${ext})
+exten => sw_62_NOANSWER,11,Goto(s,12)
+exten => sw_62_ANSWER,10,Goto(s,12)
+exten => sw_62_BUSY,10,Voicemail(b${ext})
+exten => sw_62_BUSY,11,Goto(s,12)
+exten => sw_62_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_62_DONTCALL,11,Goto(s,12)
+exten => sw_62_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_62_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_61]
@@ -1656,24 +1717,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-63-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_61-63)
-exten => s,12,Return()
-exten => _sw-63-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-63-ANSWER,10,Goto(s,11)
-exten => sw-63-BUSY,10,Voicemail(b${ext})
-exten => sw-63-BUSY,11,Goto(s,11)
-exten => sw-63-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-63-DONTCALL,11,Goto(s,11)
-exten => sw-63-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-63-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_63_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_61_63)
+exten => s,13,Return()
+exten => _sw_63_.,10,Voicemail(u${ext})
+exten => _sw_63_.,11,Goto(s,12)
+exten => sw_63_,10,Goto(sw_63_.,10)
+exten => sw_63_NOANSWER,10,Voicemail(u${ext})
+exten => sw_63_NOANSWER,11,Goto(s,12)
+exten => sw_63_ANSWER,10,Goto(s,12)
+exten => sw_63_BUSY,10,Voicemail(b${ext})
+exten => sw_63_BUSY,11,Goto(s,12)
+exten => sw_63_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_63_DONTCALL,11,Goto(s,12)
+exten => sw_63_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_63_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_62]
@@ -1683,24 +1745,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-64-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_62-64)
-exten => s,12,Return()
-exten => _sw-64-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-64-ANSWER,10,Goto(s,11)
-exten => sw-64-BUSY,10,Voicemail(b${ext})
-exten => sw-64-BUSY,11,Goto(s,11)
-exten => sw-64-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-64-DONTCALL,11,Goto(s,11)
-exten => sw-64-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-64-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_64_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_62_64)
+exten => s,13,Return()
+exten => _sw_64_.,10,Voicemail(u${ext})
+exten => _sw_64_.,11,Goto(s,12)
+exten => sw_64_,10,Goto(sw_64_.,10)
+exten => sw_64_NOANSWER,10,Voicemail(u${ext})
+exten => sw_64_NOANSWER,11,Goto(s,12)
+exten => sw_64_ANSWER,10,Goto(s,12)
+exten => sw_64_BUSY,10,Voicemail(b${ext})
+exten => sw_64_BUSY,11,Goto(s,12)
+exten => sw_64_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_64_DONTCALL,11,Goto(s,12)
+exten => sw_64_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_64_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_63]
@@ -1710,24 +1773,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-65-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_63-65)
-exten => s,12,Return()
-exten => _sw-65-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-65-ANSWER,10,Goto(s,11)
-exten => sw-65-BUSY,10,Voicemail(b${ext})
-exten => sw-65-BUSY,11,Goto(s,11)
-exten => sw-65-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-65-DONTCALL,11,Goto(s,11)
-exten => sw-65-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-65-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_65_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_63_65)
+exten => s,13,Return()
+exten => _sw_65_.,10,Voicemail(u${ext})
+exten => _sw_65_.,11,Goto(s,12)
+exten => sw_65_,10,Goto(sw_65_.,10)
+exten => sw_65_NOANSWER,10,Voicemail(u${ext})
+exten => sw_65_NOANSWER,11,Goto(s,12)
+exten => sw_65_ANSWER,10,Goto(s,12)
+exten => sw_65_BUSY,10,Voicemail(b${ext})
+exten => sw_65_BUSY,11,Goto(s,12)
+exten => sw_65_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_65_DONTCALL,11,Goto(s,12)
+exten => sw_65_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_65_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_64]
@@ -1737,24 +1801,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-66-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_64-66)
-exten => s,12,Return()
-exten => _sw-66-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-66-ANSWER,10,Goto(s,11)
-exten => sw-66-BUSY,10,Voicemail(b${ext})
-exten => sw-66-BUSY,11,Goto(s,11)
-exten => sw-66-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-66-DONTCALL,11,Goto(s,11)
-exten => sw-66-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-66-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_66_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_64_66)
+exten => s,13,Return()
+exten => _sw_66_.,10,Voicemail(u${ext})
+exten => _sw_66_.,11,Goto(s,12)
+exten => sw_66_,10,Goto(sw_66_.,10)
+exten => sw_66_NOANSWER,10,Voicemail(u${ext})
+exten => sw_66_NOANSWER,11,Goto(s,12)
+exten => sw_66_ANSWER,10,Goto(s,12)
+exten => sw_66_BUSY,10,Voicemail(b${ext})
+exten => sw_66_BUSY,11,Goto(s,12)
+exten => sw_66_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_66_DONTCALL,11,Goto(s,12)
+exten => sw_66_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_66_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_65]
@@ -1764,24 +1829,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-67-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_65-67)
-exten => s,12,Return()
-exten => _sw-67-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-67-ANSWER,10,Goto(s,11)
-exten => sw-67-BUSY,10,Voicemail(b${ext})
-exten => sw-67-BUSY,11,Goto(s,11)
-exten => sw-67-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-67-DONTCALL,11,Goto(s,11)
-exten => sw-67-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-67-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_67_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_65_67)
+exten => s,13,Return()
+exten => _sw_67_.,10,Voicemail(u${ext})
+exten => _sw_67_.,11,Goto(s,12)
+exten => sw_67_,10,Goto(sw_67_.,10)
+exten => sw_67_NOANSWER,10,Voicemail(u${ext})
+exten => sw_67_NOANSWER,11,Goto(s,12)
+exten => sw_67_ANSWER,10,Goto(s,12)
+exten => sw_67_BUSY,10,Voicemail(b${ext})
+exten => sw_67_BUSY,11,Goto(s,12)
+exten => sw_67_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_67_DONTCALL,11,Goto(s,12)
+exten => sw_67_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_67_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_66]
@@ -1791,24 +1857,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-68-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_66-68)
-exten => s,12,Return()
-exten => _sw-68-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-68-ANSWER,10,Goto(s,11)
-exten => sw-68-BUSY,10,Voicemail(b${ext})
-exten => sw-68-BUSY,11,Goto(s,11)
-exten => sw-68-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-68-DONTCALL,11,Goto(s,11)
-exten => sw-68-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-68-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_68_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_66_68)
+exten => s,13,Return()
+exten => _sw_68_.,10,Voicemail(u${ext})
+exten => _sw_68_.,11,Goto(s,12)
+exten => sw_68_,10,Goto(sw_68_.,10)
+exten => sw_68_NOANSWER,10,Voicemail(u${ext})
+exten => sw_68_NOANSWER,11,Goto(s,12)
+exten => sw_68_ANSWER,10,Goto(s,12)
+exten => sw_68_BUSY,10,Voicemail(b${ext})
+exten => sw_68_BUSY,11,Goto(s,12)
+exten => sw_68_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_68_DONTCALL,11,Goto(s,12)
+exten => sw_68_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_68_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_67]
@@ -1818,24 +1885,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-69-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_67-69)
-exten => s,12,Return()
-exten => _sw-69-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-69-ANSWER,10,Goto(s,11)
-exten => sw-69-BUSY,10,Voicemail(b${ext})
-exten => sw-69-BUSY,11,Goto(s,11)
-exten => sw-69-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-69-DONTCALL,11,Goto(s,11)
-exten => sw-69-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-69-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_69_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_67_69)
+exten => s,13,Return()
+exten => _sw_69_.,10,Voicemail(u${ext})
+exten => _sw_69_.,11,Goto(s,12)
+exten => sw_69_,10,Goto(sw_69_.,10)
+exten => sw_69_NOANSWER,10,Voicemail(u${ext})
+exten => sw_69_NOANSWER,11,Goto(s,12)
+exten => sw_69_ANSWER,10,Goto(s,12)
+exten => sw_69_BUSY,10,Voicemail(b${ext})
+exten => sw_69_BUSY,11,Goto(s,12)
+exten => sw_69_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_69_DONTCALL,11,Goto(s,12)
+exten => sw_69_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_69_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_68]
@@ -1845,24 +1913,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-70-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_68-70)
-exten => s,12,Return()
-exten => _sw-70-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-70-ANSWER,10,Goto(s,11)
-exten => sw-70-BUSY,10,Voicemail(b${ext})
-exten => sw-70-BUSY,11,Goto(s,11)
-exten => sw-70-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-70-DONTCALL,11,Goto(s,11)
-exten => sw-70-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-70-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_70_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_68_70)
+exten => s,13,Return()
+exten => _sw_70_.,10,Voicemail(u${ext})
+exten => _sw_70_.,11,Goto(s,12)
+exten => sw_70_,10,Goto(sw_70_.,10)
+exten => sw_70_NOANSWER,10,Voicemail(u${ext})
+exten => sw_70_NOANSWER,11,Goto(s,12)
+exten => sw_70_ANSWER,10,Goto(s,12)
+exten => sw_70_BUSY,10,Voicemail(b${ext})
+exten => sw_70_BUSY,11,Goto(s,12)
+exten => sw_70_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_70_DONTCALL,11,Goto(s,12)
+exten => sw_70_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_70_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_69]
@@ -1872,24 +1941,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-71-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_69-71)
-exten => s,12,Return()
-exten => _sw-71-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-71-ANSWER,10,Goto(s,11)
-exten => sw-71-BUSY,10,Voicemail(b${ext})
-exten => sw-71-BUSY,11,Goto(s,11)
-exten => sw-71-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-71-DONTCALL,11,Goto(s,11)
-exten => sw-71-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-71-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_71_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_69_71)
+exten => s,13,Return()
+exten => _sw_71_.,10,Voicemail(u${ext})
+exten => _sw_71_.,11,Goto(s,12)
+exten => sw_71_,10,Goto(sw_71_.,10)
+exten => sw_71_NOANSWER,10,Voicemail(u${ext})
+exten => sw_71_NOANSWER,11,Goto(s,12)
+exten => sw_71_ANSWER,10,Goto(s,12)
+exten => sw_71_BUSY,10,Voicemail(b${ext})
+exten => sw_71_BUSY,11,Goto(s,12)
+exten => sw_71_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_71_DONTCALL,11,Goto(s,12)
+exten => sw_71_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_71_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_70]
@@ -1899,24 +1969,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-72-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_70-72)
-exten => s,12,Return()
-exten => _sw-72-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-72-ANSWER,10,Goto(s,11)
-exten => sw-72-BUSY,10,Voicemail(b${ext})
-exten => sw-72-BUSY,11,Goto(s,11)
-exten => sw-72-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-72-DONTCALL,11,Goto(s,11)
-exten => sw-72-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-72-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_72_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_70_72)
+exten => s,13,Return()
+exten => _sw_72_.,10,Voicemail(u${ext})
+exten => _sw_72_.,11,Goto(s,12)
+exten => sw_72_,10,Goto(sw_72_.,10)
+exten => sw_72_NOANSWER,10,Voicemail(u${ext})
+exten => sw_72_NOANSWER,11,Goto(s,12)
+exten => sw_72_ANSWER,10,Goto(s,12)
+exten => sw_72_BUSY,10,Voicemail(b${ext})
+exten => sw_72_BUSY,11,Goto(s,12)
+exten => sw_72_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_72_DONTCALL,11,Goto(s,12)
+exten => sw_72_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_72_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_71]
@@ -1926,24 +1997,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-73-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_71-73)
-exten => s,12,Return()
-exten => _sw-73-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-73-ANSWER,10,Goto(s,11)
-exten => sw-73-BUSY,10,Voicemail(b${ext})
-exten => sw-73-BUSY,11,Goto(s,11)
-exten => sw-73-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-73-DONTCALL,11,Goto(s,11)
-exten => sw-73-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-73-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_73_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_71_73)
+exten => s,13,Return()
+exten => _sw_73_.,10,Voicemail(u${ext})
+exten => _sw_73_.,11,Goto(s,12)
+exten => sw_73_,10,Goto(sw_73_.,10)
+exten => sw_73_NOANSWER,10,Voicemail(u${ext})
+exten => sw_73_NOANSWER,11,Goto(s,12)
+exten => sw_73_ANSWER,10,Goto(s,12)
+exten => sw_73_BUSY,10,Voicemail(b${ext})
+exten => sw_73_BUSY,11,Goto(s,12)
+exten => sw_73_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_73_DONTCALL,11,Goto(s,12)
+exten => sw_73_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_73_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_72]
@@ -1953,24 +2025,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-74-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_72-74)
-exten => s,12,Return()
-exten => _sw-74-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-74-ANSWER,10,Goto(s,11)
-exten => sw-74-BUSY,10,Voicemail(b${ext})
-exten => sw-74-BUSY,11,Goto(s,11)
-exten => sw-74-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-74-DONTCALL,11,Goto(s,11)
-exten => sw-74-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-74-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_74_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_72_74)
+exten => s,13,Return()
+exten => _sw_74_.,10,Voicemail(u${ext})
+exten => _sw_74_.,11,Goto(s,12)
+exten => sw_74_,10,Goto(sw_74_.,10)
+exten => sw_74_NOANSWER,10,Voicemail(u${ext})
+exten => sw_74_NOANSWER,11,Goto(s,12)
+exten => sw_74_ANSWER,10,Goto(s,12)
+exten => sw_74_BUSY,10,Voicemail(b${ext})
+exten => sw_74_BUSY,11,Goto(s,12)
+exten => sw_74_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_74_DONTCALL,11,Goto(s,12)
+exten => sw_74_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_74_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten_73]
@@ -1980,24 +2053,25 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-75-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten_73-75)
-exten => s,12,Return()
-exten => _sw-75-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-75-ANSWER,10,Goto(s,11)
-exten => sw-75-BUSY,10,Voicemail(b${ext})
-exten => sw-75-BUSY,11,Goto(s,11)
-exten => sw-75-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-75-DONTCALL,11,Goto(s,11)
-exten => sw-75-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-75-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_75_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_73_75)
+exten => s,13,Return()
+exten => _sw_75_.,10,Voicemail(u${ext})
+exten => _sw_75_.,11,Goto(s,12)
+exten => sw_75_,10,Goto(sw_75_.,10)
+exten => sw_75_NOANSWER,10,Voicemail(u${ext})
+exten => sw_75_NOANSWER,11,Goto(s,12)
+exten => sw_75_ANSWER,10,Goto(s,12)
+exten => sw_75_BUSY,10,Voicemail(b${ext})
+exten => sw_75_BUSY,11,Goto(s,12)
+exten => sw_75_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_75_DONTCALL,11,Goto(s,12)
+exten => sw_75_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_75_TORTURE,11,Goto(s,12)
 
 
 [std-priv-exten]
@@ -2007,39 +2081,40 @@ exten => s,3,Set(LOCAL(timeout)=${ARG3})
 exten => s,4,Set(LOCAL(opts)=${ARG4})
 exten => s,5,Set(LOCAL(torcont)=${ARG5})
 exten => s,6,Set(LOCAL(dontcont)=${ARG6})
-exten => s,7,Set(~~EXTEN~~=${EXTEN})
-exten => s,8,Dial(${dev},${timeout},${opts})
-exten => s,9,NoOp(${DIALSTATUS} was chosen)
-exten => s,10,Goto(sw-76-${DIALSTATUS},10)
-exten => s,11,NoOp(Finish switch-std-priv-exten-76)
-exten => s,12,Return()
-exten => _sw-76-.,10,Voicemail(u${ext})
-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,11)
-exten => sw-76-ANSWER,10,Goto(s,11)
-exten => sw-76-BUSY,10,Voicemail(b${ext})
-exten => sw-76-BUSY,11,Goto(s,11)
-exten => sw-76-DONTCALL,10,Goto(${dontcont},s,begin)
-exten => sw-76-DONTCALL,11,Goto(s,11)
-exten => sw-76-TORTURE,10,Goto(${torcont},s,begin)
-exten => sw-76-TORTURE,11,Goto(s,11)
+exten => s,7,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,8,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,9,Dial(${dev},${timeout},${opts})
+exten => s,10,NoOp(${DIALSTATUS} was chosen)
+exten => s,11,Goto(sw_76_${DIALSTATUS},10)
+exten => s,12,NoOp(Finish switch_std-priv-exten_76)
+exten => s,13,Return()
+exten => _sw_76_.,10,Voicemail(u${ext})
+exten => _sw_76_.,11,Goto(s,12)
+exten => sw_76_,10,Goto(sw_76_.,10)
+exten => sw_76_NOANSWER,10,Voicemail(u${ext})
+exten => sw_76_NOANSWER,11,Goto(s,12)
+exten => sw_76_ANSWER,10,Goto(s,12)
+exten => sw_76_BUSY,10,Voicemail(b${ext})
+exten => sw_76_BUSY,11,Goto(s,12)
+exten => sw_76_DONTCALL,10,Goto(${dontcont},s,begin)
+exten => sw_76_DONTCALL,11,Goto(s,12)
+exten => sw_76_TORTURE,10,Goto(${torcont},s,begin)
+exten => sw_76_TORTURE,11,Goto(s,12)
 
 
 [fillcidname]
 exten => s,1,GotoIf($["${CALLERID(num)}" = "" ]?2:3)
 exten => s,2,Return()
-exten => s,3,NoOp(Finish if-fillcidname-77)
+exten => s,3,NoOp(Finish if_fillcidname_77)
 exten => s,4,Set(cidn=${DB(cidname/${CALLERID(num)})})
 exten => s,5,GotoIf($["${CALLERID(name)}" != "" ]?6:9)
 exten => s,6,GotoIf($[("${cidn}" = "Privacy Manager" & "${CALLERID(name)}" != "Privacy Manager") | "${cidn}" = "" ]?7:8)
 exten => s,7,Set(DB(cidname/${CALLERID(num)})=${CALLERID(name)})
-exten => s,8,NoOp(Finish if-if-fillcidname-78-79)
-exten => s,9,NoOp(Finish if-fillcidname-78)
+exten => s,8,NoOp(Finish if_if_fillcidname_78_79)
+exten => s,9,NoOp(Finish if_fillcidname_78)
 exten => s,10,GotoIf($[( "${cidn}" != "" ) & ( "${CALLERID(name)}" = ""                                                    | "${CALLERID(name)}" = "CODY,WY        "                                                       | "${CALLERID(name)}" = "POWELL,WY      "                                                       | "${CALLERID(name)}" = "WIRELESS CALLER"                                                     | "${CALLERID(name)}" = "SUBSCRIBER,WIRE"                                                     | "${CALLERID(name)}" = "CELLULAR ONE"                                                     | "${CALLERID(name)}" = "Cellular One Customer"                                                       | "${CALLERID(name)}" = "CELLULAR ONE   "                                                       | "${CALLERID(name)}" = "Privacy Manager"                                                    | "${CALLERID(name)}" = "RIVERTON,WY    "                                                     | "${CALLERID(name)}" = "BASIN,WY       "                                                     | "${CALLERID(name)}" = "BILLINGS,MT    "                                                   | "${CALLERID(name)}" = "PROVO,UT       "                                                     | "${CALLERID(name)}" = "TOLL FREE      " ) ]?11:12)
 exten => s,11,Set(CALLERID(name)=${cidn})
-exten => s,12,NoOp(Finish if-fillcidname-80)
+exten => s,12,NoOp(Finish if_fillcidname_80)
 exten => s,13,Return()
 
 
@@ -2061,8 +2136,8 @@ exten => s,14,GotoIf($["${DIALSTATUS}" = "CHANUNAVAIL" ]?15:18)
 exten => s,15,BackGround(try_cell)
 exten => s,16,Set(CALLERID(num)=$[${cidnu}])
 exten => s,17,Dial(Zap/2/${lookup},${waittime},${dialopts})
-exten => s,18,NoOp(Finish if-if-ciddial-81-82)
-exten => s,19,NoOp(Finish if-ciddial-81)
+exten => s,18,NoOp(Finish if_if_ciddial_81_82)
+exten => s,19,NoOp(Finish if_ciddial_81)
 exten => s,20,Return()
 
 
@@ -2079,7 +2154,7 @@ exten => s,9,Dial(${ddev}/${dialnum}|${waittime}|${dialopts})
 exten => s,10,GotoIf($["${DIALSTATUS}" = "CHANUNAVAIL" ]?11:13)
 exten => s,11,BackGround(try_cell)
 exten => s,12,Dial(Zap/2/${lookup},${waittime},${dialopts})
-exten => s,13,NoOp(Finish if-ciddial3-83)
+exten => s,13,NoOp(Finish if_ciddial3_83)
 exten => s,14,Return()
 
 
@@ -2101,8 +2176,8 @@ exten => s,14,Dial(${ddev}/${dialnum},${waittime}|${dialopts})
 exten => s,15,GotoIf($["${DIALSTATUS}" = "CHANUNAVAIL" ]?16:18)
 exten => s,16,BackGround(try_cell)
 exten => s,17,Dial(Zap/2/${lookup},${waittime},${dialopts})
-exten => s,18,NoOp(Finish if-if-ciddial2-84-85)
-exten => s,19,NoOp(Finish if-ciddial2-84)
+exten => s,18,NoOp(Finish if_if_ciddial2_84_85)
+exten => s,19,NoOp(Finish if_ciddial2_84)
 exten => s,20,Return()
 
 
@@ -2132,121 +2207,122 @@ exten => s,8,Background(tt-weasels)
 exten => s,9,Hangup()
 exten => s,10,Goto(12)
 exten => s,11,Goto(homeline,s,postPriv)
-exten => s,12,NoOp(Finish if-privacyManagerFailed-86)
+exten => s,12,NoOp(Finish if_privacyManagerFailed_86)
 
 
 [homeline]
-exten => s,1,Set(~~EXTEN~~=${EXTEN})
-exten => s,2(begin),Answer()
-exten => s,3,Set(repeatcount=0)
-exten => s,4,Zapateller(nocallerid)
-exten => s,5,PrivacyManager()
-exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
-exten => s,8,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
-exten => s,9,Hangup()
-exten => s,10,Return()
-exten => s,11,NoOp(Finish if-homeline-87)
-exten => s,12(postPriv),Gosub(fillcidname,s,1)
-exten => s,13,Set(CONFCIDNA=${CALLERID(name)})
-exten => s,14,Set(CONFCIDNU=${CALLERID(num)})
-exten => s,15,AGI(callall)
-exten => s,16,AGI(submit-announce.agi)
-exten => s,17,GotoIf($["${CALLERID(num)}" : "1" ]?18:19)
-exten => s,18,Gosub(callerid-bad,s,1)
-exten => s,19,NoOp(Finish if-homeline-88)
-exten => s,20,GotoIf($["${CALLERID(num)}"  = "7077577685" & "${CALLERID(name)}" : "Privacy Manager" ]?21:22)
-exten => s,21,Gosub(callerid-liar,s,1)
-exten => s,22,NoOp(Finish if-homeline-89)
-exten => s,23,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
-exten => s,24,Set(lds=${DB(playlds/${CALLERID(num)})})
-exten => s,25,GotoIf($["${lds}" = "1" ]?26:27)
-exten => s,26,SetMusicOnHold(mohlds)
-exten => s,27,NoOp(Finish if-homeline-90)
-exten => s,28,Set(direct=$[${DB(DirectCall/${CALLERID(num)})}])
-exten => s,29,GotoIf($["${direct}" != "" & ${direct} != 0 ]?30:37)
-exten => s,30,verbose(direct is XXX#${direct}XXXX)
-exten => s,31,Playback(greetings/direct)
-exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
-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 => _sw-92-.,10,Set(z=${direct}-2)
-exten => _sw-92-.,11,Goto(homeline-kids,${z},1)
-exten => sw-92-,10,Goto(sw-92-.,10)
-exten => sw-92-2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
-exten => sw-92-2,11,Goto(s,loopback)
-exten => sw-92-1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
-exten => sw-92-1,11,Goto(s,loopback)
+exten => s,1,Set(LOCAL(~~EXTEN~~)=${EXTEN})
+exten => s,2,Set(LOCAL(~~EXTEN~~)=${~~EXTEN~~})
+exten => s,3(begin),Answer()
+exten => s,4,Set(repeatcount=0)
+exten => s,5,Zapateller(nocallerid)
+exten => s,6,PrivacyManager()
+exten => s,7,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?8:12)
+exten => s,8,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
+exten => s,9,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
+exten => s,10,Hangup()
+exten => s,11,Return()
+exten => s,12,NoOp(Finish if_homeline_87)
+exten => s,13(postPriv),Gosub(fillcidname,s,1)
+exten => s,14,Set(CONFCIDNA=${CALLERID(name)})
+exten => s,15,Set(CONFCIDNU=${CALLERID(num)})
+exten => s,16,AGI(callall)
+exten => s,17,AGI(submit-announce.agi)
+exten => s,18,GotoIf($["${CALLERID(num)}" : "1" ]?19:20)
+exten => s,19,Gosub(callerid-bad,s,1)
+exten => s,20,NoOp(Finish if_homeline_88)
+exten => s,21,GotoIf($["${CALLERID(num)}"  = "7077577685" & "${CALLERID(name)}" : "Privacy Manager" ]?22:23)
+exten => s,22,Gosub(callerid-liar,s,1)
+exten => s,23,NoOp(Finish if_homeline_89)
+exten => s,24,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&)
+exten => s,25,Set(lds=${DB(playlds/${CALLERID(num)})})
+exten => s,26,GotoIf($["${lds}" = "1" ]?27:28)
+exten => s,27,SetMusicOnHold(mohlds)
+exten => s,28,NoOp(Finish if_homeline_90)
+exten => s,29,Set(direct=$[${DB(DirectCall/${CALLERID(num)})}])
+exten => s,30,GotoIf($["${direct}" != "" & ${direct} != 0 ]?31:38)
+exten => s,31,verbose(direct is XXX#${direct}XXXX)
+exten => s,32,Playback(greetings/direct)
+exten => s,33,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
+exten => s,34,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
+exten => s,35,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
+exten => s,36,Goto(sw_92_${direct},10)
+exten => s,37,NoOp(Finish switch_if_homeline_91_92)
+exten => s,38,NoOp(Finish if_homeline_91)
+exten => s,39(loopback),GotoIfTime(*,*,20-25,dec?41)
+exten => s,40,Goto(43)
+exten => s,41,Playback(greetings/christmas)
+exten => s,42,Goto(104)
+exten => s,43,GotoIfTime(*,*,31,dec?45)
+exten => s,44,Goto(47)
+exten => s,45,Playback(greetings/newyear)
+exten => s,46,Goto(103)
+exten => s,47,GotoIfTime(*,*,1,jan?49)
+exten => s,48,Goto(51)
+exten => s,49,Playback(greetings/newyear)
+exten => s,50,Goto(102)
+exten => s,51,GotoIfTime(*,*,14,feb?53)
+exten => s,52,Goto(55)
+exten => s,53,Playback(greetings/valentines)
+exten => s,54,Goto(101)
+exten => s,55,GotoIfTime(*,*,17,mar?57)
+exten => s,56,Goto(59)
+exten => s,57,Playback(greetings/stPat)
+exten => s,58,Goto(100)
+exten => s,59,GotoIfTime(*,*,31,oct?61)
+exten => s,60,Goto(63)
+exten => s,61,Playback(greetings/halloween)
+exten => s,62,Goto(99)
+exten => s,63,GotoIfTime(*,mon,15-21,jan?65)
+exten => s,64,Goto(67)
+exten => s,65,Playback(greetings/mlkDay)
+exten => s,66,Goto(98)
+exten => s,67,GotoIfTime(*,thu,22-28,nov?69)
+exten => s,68,Goto(71)
+exten => s,69,Playback(greetings/thanksgiving)
+exten => s,70,Goto(97)
+exten => s,71,GotoIfTime(*,mon,25-31,may?73)
+exten => s,72,Goto(75)
+exten => s,73,Playback(greetings/memorial)
+exten => s,74,Goto(96)
+exten => s,75,GotoIfTime(*,mon,1-7,sep?77)
+exten => s,76,Goto(79)
+exten => s,77,Playback(greetings/labor)
+exten => s,78,Goto(95)
+exten => s,79,GotoIfTime(*,mon,15-21,feb?81)
+exten => s,80,Goto(83)
+exten => s,81,Playback(greetings/president)
+exten => s,82,Goto(94)
+exten => s,83,GotoIfTime(*,sun,8-14,may?85)
+exten => s,84,Goto(87)
+exten => s,85,Playback(greetings/mothers)
+exten => s,86,Goto(93)
+exten => s,87,GotoIfTime(*,sun,15-21,jun?89)
+exten => s,88,Goto(91)
+exten => s,89,Playback(greetings/fathers)
+exten => s,90,Goto(92)
+exten => s,91,Playback(greetings/hello)
+exten => s,92,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,93,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,94,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,95,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,96,NoOp(Finish iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97_98_99_100_101)
+exten => s,97,NoOp(Finish iftime_iftime_iftime_iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97_98_99_100)
+exten => s,98,NoOp(Finish iftime_iftime_iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97_98_99)
+exten => s,99,NoOp(Finish iftime_iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97_98)
+exten => s,100,NoOp(Finish iftime_iftime_iftime_iftime_iftime_homeline_93_94_95_96_97)
+exten => s,101,NoOp(Finish iftime_iftime_iftime_iftime_homeline_93_94_95_96)
+exten => s,102,NoOp(Finish iftime_iftime_iftime_homeline_93_94_95)
+exten => s,103,NoOp(Finish iftime_iftime_homeline_93_94)
+exten => s,104,NoOp(Finish iftime_homeline_93)
+exten => s,105,Background(murphy-homeline-intro1)
+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)
+exten => sw_92_2,10,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
+exten => sw_92_2,11,Goto(s,loopback)
+exten => sw_92_1,10,Gosub(std-priv-exten,s,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
+exten => sw_92_1,11,Goto(s,loopback)
 exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
 exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
 exten => 1,3,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
@@ -2269,7 +2345,7 @@ exten => 793,2,SayDigits(${zz})
 exten => t,1,Set(repeatcount=${repeatcount} + 1)
 exten => t,2,GotoIf($[${repeatcount} < 3 ]?3:4)
 exten => t,3,Goto(s,loopback)
-exten => t,4,NoOp(Finish if-homeline-106)
+exten => t,4,NoOp(Finish if_homeline_106)
 exten => t,5,Hangup()
 exten => i,1,Background(invalid)
 exten => i,2,Goto(s,loopback)
@@ -2388,7 +2464,7 @@ exten => 793,2,SayDigits(${zz})
 exten => t,1,Set(repeatcount=$[${repeatcount} + 1])
 exten => t,2,GotoIf($[${repeatcount} < 3 ]?3:4)
 exten => t,3,Goto(s,loopback)
-exten => t,4,NoOp(Finish if-workline-107)
+exten => t,4,NoOp(Finish if_workline_107)
 exten => t,5,Hangup()
 exten => i,1,Background(invalid)
 exten => i,2,Goto(s,loopback)
@@ -2649,24 +2725,24 @@ exten => 775,1,GotoIf($[${EXTEN}=${EXTEN} ]?2:4)
 exten => 775,2,BackGround(digits/1)
 exten => 775,3,Goto(5)
 exten => 775,4,BackGround(digits/0)
-exten => 775,5,NoOp(Finish if-workext-108)
+exten => 775,5,NoOp(Finish if_workext_108)
 exten => 775,6,GotoIf($[${EXTEN}=${LANGUAGE} ]?7:9)
 exten => 775,7,BackGround(digits/1)
 exten => 775,8,Goto(10)
 exten => 775,9,BackGround(digits/0)
-exten => 775,10,NoOp(Finish if-workext-109)
+exten => 775,10,NoOp(Finish if_workext_109)
 exten => 775,11,BackGround(digits/2)
 exten => 776,1,Set(TEST=00359889811777)
 exten => 776,2,GotoIf($[${TEST}= 00359889811777 ]?3:5)
 exten => 776,3,BackGround(digits/1)
 exten => 776,4,Goto(6)
 exten => 776,5,BackGround(digits/0)
-exten => 776,6,NoOp(Finish if-workext-110)
+exten => 776,6,NoOp(Finish if_workext_110)
 exten => 776,7,GotoIf($[${TEST}= 00359889811888 ]?8:10)
 exten => 776,8,BackGround(digits/1)
 exten => 776,9,Goto(11)
 exten => 776,10,BackGround(digits/0)
-exten => 776,11,NoOp(Finish if-workext-111)
+exten => 776,11,NoOp(Finish if_workext_111)
 exten => 776,12,Hangup()
 exten => 790,1,MeetMe(790,p)
 exten => 792,1,Goto(pageall,s,begin)
diff --git a/pbx/ael/ael-test/ref.ael-vtest17 b/pbx/ael/ael-test/ref.ael-vtest17
index 353b2cc5a2ab1dd299fe2e882b1f40646bae38b5..44b3bd47d69318a51c4fa926629b599ee696b4e5 100644
--- a/pbx/ael/ael-test/ref.ael-vtest17
+++ b/pbx/ael/ael-test/ref.ael-vtest17
@@ -35,7 +35,7 @@ exten => 81,4,GotoIf($[${i}<${iterations}]?5:8)
 exten => 81,5,NoOp(Hello)
 exten => 81,6,Set(i=$[${i}+1])
 exten => 81,7,Goto(4)
-exten => 81,8,NoOp(Finish for-extension-1)
+exten => 81,8,NoOp(Finish for_extension_1)
 exten => 81,9,Set(time2=${EPOCH})
 exten => 81,10,Verbose(The time diff is $[${time2} - ${time1} ] seconds)
 exten => 81,11,Verbose(Which means that the priorities/sec = $[4* ${iterations} / (${time2} - ${time1}) ])
@@ -43,16 +43,16 @@ exten => 81,12,SayNumber($[4 * ${iterations} / (${time2} - ${time1}) ])
 exten => 82,1,Gosub(ndeep,s,1(100000))
 exten => 82,2,Verbose(Finished 100000 levels deep call!)
 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)
-exten => _sw-2-9X,10,Verbose(handle both 8x and 9x calls)
-exten => _sw-2-9X,11,Goto(sw-2-49,10)
-exten => _sw-2-8X,10,Verbose(do something to prepare it)
-exten => _sw-2-8X,11,Goto(sw-2-99,10)
+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)
+exten => _sw_2_9X,10,Verbose(handle both 8x and 9x calls)
+exten => _sw_2_9X,11,Goto(sw_2_49,10)
+exten => _sw_2_8X,10,Verbose(do something to prepare it)
+exten => _sw_2_8X,11,Goto(sw_2_99,10)
 
 
 [ndeep]
@@ -60,7 +60,7 @@ exten => s,1,Set(LOCAL(level)=${ARG1})
 exten => s,2,GotoIf($[${level} == 0]?3:5)
 exten => s,3,Verbose(2|Got to Level 0)
 exten => s,4,Return()
-exten => s,5,NoOp(Finish if-ndeep-3)
+exten => s,5,NoOp(Finish if_ndeep_3)
 exten => s,6,Gosub(ndeep,s,1($[${level}-1]))
 exten => s,7,Return()
 
diff --git a/res/ael/pval.c b/res/ael/pval.c
index 48afe6e1113bd63b99cef84f1097a4e0672ee59b..7a4311bff836cb87dd524e1f6f97a7c000b87cba 100644
--- a/res/ael/pval.c
+++ b/res/ael/pval.c
@@ -3513,7 +3513,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 			control_statement_count++;
 			loop_break_save = exten->loop_break; /* save them, then restore before leaving */
 			loop_continue_save = exten->loop_continue;
-			snprintf(new_label, BUF_SIZE, "for-%s-%d", label, control_statement_count);
+			snprintf(new_label, BUF_SIZE, "for_%s_%d", label, control_statement_count);
 			for_init = new_prio();
 			for_inc = new_prio();
 			for_test = new_prio();
@@ -3633,7 +3633,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 			for_test->app = 0;
 			for_test->appargs = strdup(buf1);
 			for_loop->goto_true = for_test;
-			snprintf(buf1, BUF_SIZE, "Finish for-%s-%d", label, control_statement_count);
+			snprintf(buf1, BUF_SIZE, "Finish for_%s_%d", label, control_statement_count);
 			for_end->app = strdup("NoOp");
 			for_end->appargs = strdup(buf1);
 			/* link & load! */
@@ -3662,7 +3662,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 			control_statement_count++;
 			loop_break_save = exten->loop_break; /* save them, then restore before leaving */
 			loop_continue_save = exten->loop_continue;
-			snprintf(new_label, BUF_SIZE, "while-%s-%d", label, control_statement_count);
+			snprintf(new_label, BUF_SIZE, "while_%s_%d", label, control_statement_count);
 			while_test = new_prio();
 			while_loop = new_prio();
 			while_end = new_prio();
@@ -3674,7 +3674,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 			while_test->app = 0;
 			while_test->appargs = strdup(buf1);
 			while_loop->goto_true = while_test;
-			snprintf(buf1, BUF_SIZE, "Finish while-%s-%d", label, control_statement_count);
+			snprintf(buf1, BUF_SIZE, "Finish while_%s_%d", label, control_statement_count);
 			while_end->app = strdup("NoOp");
 			while_end->appargs = strdup(buf1);
 
@@ -3702,15 +3702,15 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 			local_control_statement_count = control_statement_count;
 			loop_break_save = exten->loop_break; /* save them, then restore before leaving */
 			loop_continue_save = exten->loop_continue;
-			snprintf(new_label, BUF_SIZE, "sw-%s-%d", label, control_statement_count);
+			snprintf(new_label, BUF_SIZE, "sw_%s_%d", label, control_statement_count);
 			switch_test = new_prio();
 			switch_end = new_prio();
 			switch_test->type = AEL_APPCALL;
 			switch_end->type = AEL_APPCALL;
-			snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", control_statement_count, p->u1.str);
+			snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", control_statement_count, p->u1.str);
 			switch_test->app = strdup("Goto");
 			switch_test->appargs = strdup(buf1);
-			snprintf(buf1, BUF_SIZE, "Finish switch-%s-%d", label, control_statement_count);
+			snprintf(buf1, BUF_SIZE, "Finish switch_%s_%d", label, control_statement_count);
 			switch_end->app = strdup("NoOp");
 			switch_end->appargs = strdup(buf1);
 			switch_end->origin = p;
@@ -3743,9 +3743,9 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 					switch_case->loop_continue = exten->loop_continue;
 					
 					linkexten(exten,switch_case);
-					snprintf(buf1, BUF_SIZE, "sw-%d-%s", local_control_statement_count, p2->u1.str);
+					snprintf(buf1, BUF_SIZE, "sw_%d_%s", local_control_statement_count, p2->u1.str);
 					switch_case->name = strdup(buf1);
-					snprintf(new_label, BUF_SIZE, "sw-%s-%s-%d", label, p2->u1.str, local_control_statement_count);
+					snprintf(new_label, BUF_SIZE, "sw_%s_%s_%d", label, p2->u1.str, local_control_statement_count);
 					
 					if (gen_prios(switch_case, new_label, p2->u2.statements, exten, this_context)) { /* this will link in all the case body statements here */
 						return -1;
@@ -3763,7 +3763,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 							fall_thru = new_prio();
 							fall_thru->type = AEL_APPCALL;
 							fall_thru->app = strdup("Goto");
-							snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", local_control_statement_count, p2->next->u1.str);
+							snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", local_control_statement_count, p2->next->u1.str);
 							fall_thru->appargs = strdup(buf1);
 							linkprio(switch_case, fall_thru, mother_exten);
 						} else if (p2->next && p2->next->type == PV_PATTERN) {
@@ -3771,14 +3771,14 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 							fall_thru->type = AEL_APPCALL;
 							fall_thru->app = strdup("Goto");
 							gen_match_to_pattern(p2->next->u1.str, buf2);
-							snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", local_control_statement_count, buf2);
+							snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", local_control_statement_count, buf2);
 							fall_thru->appargs = strdup(buf1);
 							linkprio(switch_case, fall_thru, mother_exten);
 						} else if (p2->next && p2->next->type == PV_DEFAULT) {
 							fall_thru = new_prio();
 							fall_thru->type = AEL_APPCALL;
 							fall_thru->app = strdup("Goto");
-							snprintf(buf1, BUF_SIZE, "sw-%d-.,10", local_control_statement_count);
+							snprintf(buf1, BUF_SIZE, "sw_%d_.,10", local_control_statement_count);
 							fall_thru->appargs = strdup(buf1);
 							linkprio(switch_case, fall_thru, mother_exten);
 						} else if (!p2->next) {
@@ -3815,12 +3815,12 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 					/* the break/continue locations are inherited from parent */
 					switch_case->loop_break = exten->loop_break;
 					switch_case->loop_continue = exten->loop_continue;
-					
+
 					linkexten(exten,switch_case);
-					snprintf(buf1, BUF_SIZE, "_sw-%d-%s", local_control_statement_count, p2->u1.str);
+					snprintf(buf1, BUF_SIZE, "_sw_%d_%s", local_control_statement_count, p2->u1.str);
 					switch_case->name = strdup(buf1);
-					snprintf(new_label, BUF_SIZE, "sw-%s-%s-%d", label, p2->u1.str, local_control_statement_count);
-					
+					snprintf(new_label, BUF_SIZE, "sw_%s_%s_%d", label, p2->u1.str, local_control_statement_count);
+
 					if (gen_prios(switch_case, new_label, p2->u2.statements, exten, this_context)) { /* this will link in all the while body statements here */
 						return -1;
 					}
@@ -3836,7 +3836,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 							fall_thru = new_prio();
 							fall_thru->type = AEL_APPCALL;
 							fall_thru->app = strdup("Goto");
-							snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", local_control_statement_count, p2->next->u1.str);
+							snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", local_control_statement_count, p2->next->u1.str);
 							fall_thru->appargs = strdup(buf1);
 							linkprio(switch_case, fall_thru, mother_exten);
 						} else if (p2->next && p2->next->type == PV_PATTERN) {
@@ -3844,14 +3844,14 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 							fall_thru->type = AEL_APPCALL;
 							fall_thru->app = strdup("Goto");
 							gen_match_to_pattern(p2->next->u1.str, buf2);
-							snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", local_control_statement_count, buf2);
+							snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", local_control_statement_count, buf2);
 							fall_thru->appargs = strdup(buf1);
 							linkprio(switch_case, fall_thru, mother_exten);
 						} else if (p2->next && p2->next->type == PV_DEFAULT) {
 							fall_thru = new_prio();
 							fall_thru->type = AEL_APPCALL;
 							fall_thru->app = strdup("Goto");
-							snprintf(buf1, BUF_SIZE, "sw-%d-.,10", local_control_statement_count);
+							snprintf(buf1, BUF_SIZE, "sw_%d_.,10", local_control_statement_count);
 							fall_thru->appargs = strdup(buf1);
 							linkprio(switch_case, fall_thru, mother_exten);
 						} else if (!p2->next) {
@@ -3903,11 +3903,11 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 					switch_null->context = this_context;
 					switch_null->is_switch = 1;
 					switch_empty = new_prio();
-					snprintf(buf1, BUF_SIZE, "sw-%d-.,10", local_control_statement_count);
+					snprintf(buf1, BUF_SIZE, "sw_%d_.,10", local_control_statement_count);
 					switch_empty->app = strdup("Goto");
 					switch_empty->appargs = strdup(buf1);
 					linkprio(switch_null, switch_empty, mother_exten);
-					snprintf(buf1, BUF_SIZE, "sw-%d-", local_control_statement_count);
+					snprintf(buf1, BUF_SIZE, "sw_%d_", local_control_statement_count);
 					switch_null->name = strdup(buf1);
 					switch_null->loop_break = exten->loop_break;
 					switch_null->loop_continue = exten->loop_continue;
@@ -3917,10 +3917,10 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 					switch_case->loop_break = exten->loop_break;
 					switch_case->loop_continue = exten->loop_continue;
 					linkexten(exten,switch_case);
-					snprintf(buf1, BUF_SIZE, "_sw-%d-.", local_control_statement_count);
+					snprintf(buf1, BUF_SIZE, "_sw_%d_.", local_control_statement_count);
 					switch_case->name = strdup(buf1);
 					
-					snprintf(new_label, BUF_SIZE, "sw-%s-default-%d", label, local_control_statement_count);
+					snprintf(new_label, BUF_SIZE, "sw_%s_default_%d", label, local_control_statement_count);
 					
 					if (gen_prios(switch_case, new_label, p2->u2.statements, exten, this_context)) { /* this will link in all the default:  body statements here */
 						return -1;
@@ -3938,7 +3938,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 							fall_thru = new_prio();
 							fall_thru->type = AEL_APPCALL;
 							fall_thru->app = strdup("Goto");
-							snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", local_control_statement_count, p2->next->u1.str);
+							snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", local_control_statement_count, p2->next->u1.str);
 							fall_thru->appargs = strdup(buf1);
 							linkprio(switch_case, fall_thru, mother_exten);
 						} else if (p2->next && p2->next->type == PV_PATTERN) {
@@ -3946,14 +3946,14 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 							fall_thru->type = AEL_APPCALL;
 							fall_thru->app = strdup("Goto");
 							gen_match_to_pattern(p2->next->u1.str, buf2);
-							snprintf(buf1, BUF_SIZE, "sw-%d-%s,10", local_control_statement_count, buf2);
+							snprintf(buf1, BUF_SIZE, "sw_%d_%s,10", local_control_statement_count, buf2);
 							fall_thru->appargs = strdup(buf1);
 							linkprio(switch_case, fall_thru, mother_exten);
 						} else if (p2->next && p2->next->type == PV_DEFAULT) {
 							fall_thru = new_prio();
 							fall_thru->type = AEL_APPCALL;
 							fall_thru->app = strdup("Goto");
-							snprintf(buf1, BUF_SIZE, "sw-%d-.,10", local_control_statement_count);
+							snprintf(buf1, BUF_SIZE, "sw_%d_.,10", local_control_statement_count);
 							fall_thru->appargs = strdup(buf1);
 							linkprio(switch_case, fall_thru, mother_exten);
 						} else if (!p2->next) {
@@ -4052,7 +4052,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 
 		case PV_IFTIME:
 			control_statement_count++;
-			snprintf(new_label, BUF_SIZE, "iftime-%s-%d", label, control_statement_count);
+			snprintf(new_label, BUF_SIZE, "iftime_%s_%d", label, control_statement_count);
 			
 			if_test = new_prio();
 			if_test->type = AEL_IFTIME_CONTROL;
@@ -4067,7 +4067,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 
 			if_end = new_prio();
 			if_end->type = AEL_APPCALL;
-			snprintf(buf1, BUF_SIZE, "Finish iftime-%s-%d", label, control_statement_count);
+			snprintf(buf1, BUF_SIZE, "Finish iftime_%s_%d", label, control_statement_count);
 			if_end->app = strdup("NoOp");
 			if_end->appargs = strdup(buf1);
 
@@ -4115,7 +4115,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 		case PV_RANDOM:
 		case PV_IF:
 			control_statement_count++;
-			snprintf(new_label, BUF_SIZE, "if-%s-%d", label, control_statement_count);
+			snprintf(new_label, BUF_SIZE, "if_%s_%d", label, control_statement_count);
 			
 			if_test = new_prio();
 			if_end = new_prio();
@@ -4127,7 +4127,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 				snprintf(buf1, BUF_SIZE, "$[%s]", p->u1.str);
 			if_test->app = 0;
 			if_test->appargs = strdup(buf1);
-			snprintf(buf1, BUF_SIZE, "Finish if-%s-%d", label, control_statement_count);
+			snprintf(buf1, BUF_SIZE, "Finish if_%s_%d", label, control_statement_count);
 			if_end->app = strdup("NoOp");
 			if_end->appargs = strdup(buf1);
 			if_test->origin = p;
@@ -4185,7 +4185,7 @@ static int gen_prios(struct ael_extension *exten, char *label, pval *statement,
 			switch_case->context = this_context;
 			linkexten(exten,switch_case);
 			switch_case->name = strdup(p->u1.str);
-			snprintf(new_label, BUF_SIZE, "catch-%s-%d",p->u1.str, control_statement_count);
+			snprintf(new_label, BUF_SIZE, "catch_%s_%d",p->u1.str, control_statement_count);
 			
 			if (gen_prios(switch_case, new_label, p->u2.statements, mother_exten,this_context)) { /* this will link in all the catch body statements here */
 				return -1;