Remove as much trailing whitespace as possible.

Change-Id: I873c1c6d00f447269bd841494459efccdd2c19c0

23 files changed, 476 insertions, 493 deletions

diff --git a/pbx/ael/ael-test/ael-ntest12/extensions.ael b/pbx/ael/ael-test/ael-ntest12/extensions.ael
index 1e3183358..ab2263ec2 100644
--- a/pbx/ael/ael-test/ael-ntest12/extensions.ael
+++ b/pbx/ael/ael-test/ael-ntest12/extensions.ael
@@ -1,8 +1,8 @@
 context test1
 {
         771 => {
-                for(	i=0; 
-			${i} <= 3; 
+                for(	i=0;
+			${i} <= 3;
 			i = ${i} + 1 )
                         NoOp(i is '${i}');
         }
diff --git a/pbx/ael/ael-test/ael-ntest22/extensions.ael b/pbx/ael/ael-test/ael-ntest22/extensions.ael
index b787f4b03..f476bd532 100644
--- a/pbx/ael/ael-test/ael-ntest22/extensions.ael
+++ b/pbx/ael/ael-test/ael-ntest22/extensions.ael
@@ -1,6 +1,6 @@
 #include "t1/*.ael"
 
-context z 
+context z
 {
 	123 => NoOp(hi there, z);
 	124 => NoOp(hi there, z);
diff --git a/pbx/ael/ael-test/ael-ntest22/t2/f.ael b/pbx/ael/ael-test/ael-ntest22/t2/f.ael
index ba15a6389..e47698ed5 100644
--- a/pbx/ael/ael-test/ael-ntest22/t2/f.ael
+++ b/pbx/ael/ael-test/ael-ntest22/t2/f.ael
@@ -6,4 +6,3 @@ context f
 }
 
 #include "t3/*.ael"
-
diff --git a/pbx/ael/ael-test/ael-ntest23/t2/f.ael b/pbx/ael/ael-test/ael-ntest23/t2/f.ael
index ba15a6389..e47698ed5 100644
--- a/pbx/ael/ael-test/ael-ntest23/t2/f.ael
+++ b/pbx/ael/ael-test/ael-ntest23/t2/f.ael
@@ -6,4 +6,3 @@ context f
 }
 
 #include "t3/*.ael"
-
diff --git a/pbx/ael/ael-test/ael-ntest24/extensions.ael b/pbx/ael/ael-test/ael-ntest24/extensions.ael
index ea14aff6e..a428ed7ea 100644
--- a/pbx/ael/ael-test/ael-ntest24/extensions.ael
+++ b/pbx/ael/ael-test/ael-ntest24/extensions.ael
@@ -23,5 +23,3 @@ _X. => {
                 }
         }
 }
-
-
diff --git a/pbx/ael/ael-test/ael-ntest9/extensions.ael b/pbx/ael/ael-test/ael-ntest9/extensions.ael
index b9762ed54..d4c07b4ff 100755
--- a/pbx/ael/ael-test/ael-ntest9/extensions.ael
+++ b/pbx/ael/ael-test/ael-ntest9/extensions.ael
@@ -9,4 +9,3 @@ context workext {
     		Verbose(2|${query}) ;
 	}
 }
-
diff --git a/pbx/ael/ael-test/ael-test1/extensions.ael b/pbx/ael/ael-test/ael-test1/extensions.ael
index e1943f67c..b41d75085 100644
--- a/pbx/ael/ael-test/ael-test1/extensions.ael
+++ b/pbx/ael/ael-test/ael-test1/extensions.ael
@@ -66,7 +66,7 @@ context testloop {
         includes {
                 other|16:00-23:59|m0n-fri|*|*;
         };
-	
+
     1 => {
          for (x=0; ${x} < 3; x=${x} + 1) {
               Verbose(x is ${x} !);
@@ -93,9 +93,9 @@ context testloop {
 			return;
               y=${y}-1;
          };
-    }; 
+    };
     regexten hint(nasty/Thingy&nasty/Thingamabob) 3 => {
-        for (x=0; ${x} < 3; x=${x} + 1) 
+        for (x=0; ${x} < 3; x=${x} + 1)
 		{
             	Verbose(x is ${x} !);
 		if( ${x} = 4 )
@@ -106,7 +106,7 @@ context testloop {
 			return;
 
         	y=10;
-	        while (${y} >= 0) 
+	        while (${y} >= 0)
 			{
             			Verbose(y is ${y} !);
 				if( ${y} = 4 )
@@ -118,10 +118,10 @@ context testloop {
 	   		         y=${y}-1;
 			};
         };
-    }; 
+    };
     4 => {
        	y=10;
-        while (${y} >= 0) 
+        while (${y} >= 0)
 	{
             	Verbose(y is ${y} !);
 		if( ${y} = 4 )
@@ -130,7 +130,7 @@ context testloop {
 			continue;
 		if( ${y} = 6 )
 			return;
-       		for (x=0; ${x} < 3; x=${x} + 1) 
+       		for (x=0; ${x} < 3; x=${x} + 1)
 		{
             		Verbose(x is ${x} !);
 			if( ${x} = 4 )
@@ -139,7 +139,7 @@ context testloop {
 				continue;
 			if( ${x} = 6 )
 				return;
-		        for (z=0; ${z} < 17; z=${z} + 1) 
+		        for (z=0; ${z} < 17; z=${z} + 1)
 			{
               			Verbose(z is ${z} !);
               			Verbose(z is ${z} !);
@@ -152,11 +152,11 @@ context testloop {
               			Verbose(z is ${z} !);
               			Verbose(z is ${z} !);
          		};
-				
+
 		};
 	        y=${y}-1;
         };
-    }; 
+    };
     5 => {
 		&exten-gen(axel,brain);
     };
diff --git a/pbx/ael/ael-test/ael-test11/extensions.ael b/pbx/ael/ael-test/ael-test11/extensions.ael
index a6b2226f8..e5461b702 100644
--- a/pbx/ael/ael-test/ael-test11/extensions.ael
+++ b/pbx/ael/ael-test/ael-test11/extensions.ael
@@ -1,6 +1,6 @@
 context test1
 {
-	s => 
+	s =>
 		{
 			goto lab1;
 			if( ${testnotnull} )
diff --git a/pbx/ael/ael-test/ael-test16/extensions.ael b/pbx/ael/ael-test/ael-test16/extensions.ael
index 5f3b2e4e9..69774adcc 100644
--- a/pbx/ael/ael-test/ael-test16/extensions.ael
+++ b/pbx/ael/ael-test/ael-test16/extensions.ael
@@ -1,4 +1,3 @@
 context real-small {
 
 }
-
diff --git a/pbx/ael/ael-test/ael-test18/extensions.ael b/pbx/ael/ael-test/ael-test18/extensions.ael
index ee03d5909..c1ea6a1ff 100644
--- a/pbx/ael/ael-test/ael-test18/extensions.ael
+++ b/pbx/ael/ael-test/ael-test18/extensions.ael
@@ -37,4 +37,3 @@ context default
          };
 
 }
-
diff --git a/pbx/ael/ael-test/ael-test19/extensions.ael b/pbx/ael/ael-test/ael-test19/extensions.ael
index 07af91482..8e42a9844 100644
--- a/pbx/ael/ael-test/ael-test19/extensions.ael
+++ b/pbx/ael/ael-test/ael-test19/extensions.ael
@@ -1,12 +1,12 @@
 context dialextens
 {
-	/* 
+	/*
 		101 thru 123, 149 thru 152
         */
 	_10X => Dial(Zap/${EXTEN:2},30,Ttw);
 	_1ZX => Dial(Zap/${EXTEN:1},30,Ttw);
 }
-/* 
+/*
     Due to extenal wiring:
 
   dialing 125 will ring 101
@@ -183,7 +183,7 @@ macro funcC(a,b)
 		goto y,lab1;
 	catch y
 	{	lab1:
-		&funcB(${a},${b});	
+		&funcB(${a},${b});
 	}
 }
 
@@ -196,7 +196,7 @@ macro funcB(a,b)
 		goto z,lab2;
 	catch z
 	{	lab2:
-		&funcC(${a},${b});	
+		&funcC(${a},${b});
 	}
 }
 
@@ -236,7 +236,7 @@ context extension
 			Verbose(Finished 100000 levels deep call!);
 		}
 	83 => {
-		switch (${EXTEN}) 
+		switch (${EXTEN})
 		{
 		pattern 8X:
     			Verbose(do something to prepare it);
@@ -288,7 +288,7 @@ context extension
 		Verbose(ChannelOnly=${ChannelOnly}; neat huh?);
 		Set(ChannelOnly=${CUT(CHANNEL,,1)});
 		Verbose(ChannelOnly=${ChannelOnly}; neat huh?);
-	}	
+	}
 	873 => {
 		NOOP(this is a forkcdr test);
 		Set(CALLERID(num)=1234567890);
diff --git a/pbx/ael/ael-test/ael-test2/extensions.ael b/pbx/ael/ael-test/ael-test2/extensions.ael
index 176338872..074ff9e0b 100644
--- a/pbx/ael/ael-test/ael-test2/extensions.ael
+++ b/pbx/ael/ael-test/ael-test2/extensions.ael
@@ -1,8 +1,7 @@
 context test1
 {
-	s => 
+	s =>
 	{
 		#include "apptest.ael2";
 	}
 }
-
diff --git a/pbx/ael/ael-test/ael-test20/extensions.ael b/pbx/ael/ael-test/ael-test20/extensions.ael
index 8ec219864..2265aaced 100644
--- a/pbx/ael/ael-test/ael-test20/extensions.ael
+++ b/pbx/ael/ael-test/ael-test20/extensions.ael
@@ -5,4 +5,3 @@ context interesting {
         }
 	13 => NoOp(LuckyNumber!);
 }
-
diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
index ff1f6aea5..95492116b 100755
--- a/pbx/ael/ael-test/ael-test3/extensions.ael
+++ b/pbx/ael/ael-test/ael-test3/extensions.ael
@@ -11,11 +11,11 @@ globals
 	FWDVMBOX=1 ;                // the VM box for this user
 }
 
-macro std-exten( ext , dev ) 
+macro std-exten( ext , dev )
 {
         Dial(${dev}/${ext},20);
 	goto privacyManagerFailed|s|begin;
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case BUSY:
                 Voicemail(b${ext});
@@ -33,11 +33,11 @@ macro std-exten( ext , dev )
         }
 }
 
-macro std-priv-exten_1( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_1( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -59,11 +59,11 @@ macro std-priv-exten_1( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_2( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_2( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -85,11 +85,11 @@ macro std-priv-exten_2( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_3( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_3( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -111,11 +111,11 @@ macro std-priv-exten_3( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_4( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_4( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -137,11 +137,11 @@ macro std-priv-exten_4( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_5( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_5( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -163,11 +163,11 @@ macro std-priv-exten_5( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_6( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_6( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -189,11 +189,11 @@ macro std-priv-exten_6( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_7( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_7( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -215,11 +215,11 @@ macro std-priv-exten_7( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_8( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_8( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -241,11 +241,11 @@ macro std-priv-exten_8( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_9( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_9( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -267,11 +267,11 @@ macro std-priv-exten_9( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_10( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_10( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -293,11 +293,11 @@ macro std-priv-exten_10( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_11( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_11( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -319,11 +319,11 @@ macro std-priv-exten_11( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_12( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_12( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -345,11 +345,11 @@ macro std-priv-exten_12( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_13( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_13( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -371,11 +371,11 @@ macro std-priv-exten_13( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_14( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_14( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -397,11 +397,11 @@ macro std-priv-exten_14( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_15( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_15( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -423,11 +423,11 @@ macro std-priv-exten_15( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_16( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_16( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -449,11 +449,11 @@ macro std-priv-exten_16( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_17( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_17( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -475,11 +475,11 @@ macro std-priv-exten_17( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_18( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_18( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -501,11 +501,11 @@ macro std-priv-exten_18( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_19( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_19( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -527,11 +527,11 @@ macro std-priv-exten_19( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_20( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_20( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -553,11 +553,11 @@ macro std-priv-exten_20( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_21( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_21( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -579,11 +579,11 @@ macro std-priv-exten_21( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_22( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_22( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -605,11 +605,11 @@ macro std-priv-exten_22( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_23( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_23( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -631,11 +631,11 @@ macro std-priv-exten_23( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_24( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_24( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -657,11 +657,11 @@ macro std-priv-exten_24( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_25( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_25( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -683,11 +683,11 @@ macro std-priv-exten_25( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_26( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_26( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -709,11 +709,11 @@ macro std-priv-exten_26( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_27( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_27( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -735,11 +735,11 @@ macro std-priv-exten_27( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_28( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_28( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -761,11 +761,11 @@ macro std-priv-exten_28( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_29( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_29( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -787,11 +787,11 @@ macro std-priv-exten_29( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_30( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_30( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -813,11 +813,11 @@ macro std-priv-exten_30( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_31( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_31( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -839,11 +839,11 @@ macro std-priv-exten_31( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_32( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_32( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -865,11 +865,11 @@ macro std-priv-exten_32( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_33( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_33( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -891,11 +891,11 @@ macro std-priv-exten_33( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_34( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_34( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -917,11 +917,11 @@ macro std-priv-exten_34( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_35( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_35( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -943,11 +943,11 @@ macro std-priv-exten_35( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_36( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_36( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -969,11 +969,11 @@ macro std-priv-exten_36( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_37( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_37( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -995,11 +995,11 @@ macro std-priv-exten_37( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_38( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_38( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1021,11 +1021,11 @@ macro std-priv-exten_38( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_39( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_39( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1047,11 +1047,11 @@ macro std-priv-exten_39( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_40( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_40( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1073,11 +1073,11 @@ macro std-priv-exten_40( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_41( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_41( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1099,11 +1099,11 @@ macro std-priv-exten_41( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_42( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_42( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1125,11 +1125,11 @@ macro std-priv-exten_42( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_43( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_43( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1151,11 +1151,11 @@ macro std-priv-exten_43( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_44( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_44( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1177,11 +1177,11 @@ macro std-priv-exten_44( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_45( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_45( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1203,11 +1203,11 @@ macro std-priv-exten_45( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_46( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_46( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1229,11 +1229,11 @@ macro std-priv-exten_46( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_47( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_47( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1255,11 +1255,11 @@ macro std-priv-exten_47( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_48( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_48( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1281,11 +1281,11 @@ macro std-priv-exten_48( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_49( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_49( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1307,11 +1307,11 @@ macro std-priv-exten_49( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_50( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_50( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1333,11 +1333,11 @@ macro std-priv-exten_50( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_51( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_51( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1359,11 +1359,11 @@ macro std-priv-exten_51( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_52( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_52( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1385,11 +1385,11 @@ macro std-priv-exten_52( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_53( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_53( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1411,11 +1411,11 @@ macro std-priv-exten_53( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_54( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_54( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1437,11 +1437,11 @@ macro std-priv-exten_54( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_55( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_55( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1463,11 +1463,11 @@ macro std-priv-exten_55( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_56( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_56( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1489,11 +1489,11 @@ macro std-priv-exten_56( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_57( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_57( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1515,11 +1515,11 @@ macro std-priv-exten_57( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_58( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_58( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1541,11 +1541,11 @@ macro std-priv-exten_58( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_59( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_59( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1567,11 +1567,11 @@ macro std-priv-exten_59( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_60( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_60( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1593,11 +1593,11 @@ macro std-priv-exten_60( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_61( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_61( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1619,11 +1619,11 @@ macro std-priv-exten_61( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_62( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_62( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1645,11 +1645,11 @@ macro std-priv-exten_62( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_63( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_63( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1671,11 +1671,11 @@ macro std-priv-exten_63( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_64( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_64( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1697,11 +1697,11 @@ macro std-priv-exten_64( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_65( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_65( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1723,11 +1723,11 @@ macro std-priv-exten_65( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_66( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_66( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1749,11 +1749,11 @@ macro std-priv-exten_66( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_67( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_67( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1775,11 +1775,11 @@ macro std-priv-exten_67( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_68( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_68( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1801,11 +1801,11 @@ macro std-priv-exten_68( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_69( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_69( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1827,11 +1827,11 @@ macro std-priv-exten_69( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_70( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_70( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1853,11 +1853,11 @@ macro std-priv-exten_70( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_71( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_71( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1879,11 +1879,11 @@ macro std-priv-exten_71( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_72( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_72( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1905,11 +1905,11 @@ macro std-priv-exten_72( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_73( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_73( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1931,11 +1931,11 @@ macro std-priv-exten_73( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1963,33 +1963,33 @@ macro fillcidname()
         Set(cidn=${DB(cidname/${CALLERID(num)})});
         if( "${CALLERID(name)}" != "" )
         {
-                if( ("${cidn}" = "Privacy Manager" & "${CALLERID(name)}" != "Privacy Manager") | "${cidn}" = "" ) // if the entry isn't in the database, 
+                if( ("${cidn}" = "Privacy Manager" & "${CALLERID(name)}" != "Privacy Manager") | "${cidn}" = "" ) // if the entry isn't in the database,
                                                                                 // or if an entry exists, and it's "Privacy Manager", empty, (or add other useless possibilities).
-                { 
+                {
                        Set(DB(cidname/${CALLERID(num)})=${CALLERID(name)});     // then set or override what's in the DB
                 }
         }
         // Now, we fill in the callerid info from the incoming entry, if it's stuff worth using
         // Ignore fundamentally semi-anonymous information from local cell phones
         // if the db has an entry for this number, and it's not a canned string from a cell phone company
-        if(  ( "${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       "  
+        if(  ( "${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      " ) )  // put stuff in the above, that the phone company tends to put in your callerid, 
+                                                  | "${CALLERID(name)}" = "PROVO,UT       "
+                                                  | "${CALLERID(name)}" = "TOLL FREE      " ) )  // put stuff in the above, that the phone company tends to put in your callerid,
                                                                                                  // that you would rather override with DB info
                                                                                                  // there's no way to guess them all, but you can get the most popular ones...
                                                                                                  // why cell phones can't do CID like everybody else, ....?
-        {    
+        {
                 Set(CALLERID(name)=${cidn});  // Override what the phone company provides with what's in the DB for this number.
         }
 }
@@ -2008,7 +2008,7 @@ macro ciddial(dialnum, lookup, waittime, dialopts, ddev)
 		if( "${DIALSTATUS}" = "CHANUNAVAIL" )
 		{
 			BackGround(try_cell);
-			CALLERID(num)=${cidnu}; // put the original number back 
+			CALLERID(num)=${cidnu}; // put the original number back
 			Dial(Zap/2/${lookup},${waittime},${dialopts});
 		}
 	}
@@ -2036,7 +2036,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
 	Dial(SIP/1${lookup}@tctwest,${waittime},${dialopts});
 	if( "${DIALSTATUS}" = "CHANUNAVAIL" )
 	{
-		Set(CALLERID(num)=${cidnu}); // put the original number back 
+		Set(CALLERID(num)=${cidnu}); // put the original number back
 		BackGround(try_zap);
 		Dial(${ddev}/${dialnum},${waittime}|${dialopts});
 		if( "${DIALSTATUS}" = "CHANUNAVAIL" )
@@ -2050,14 +2050,14 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
 macro callerid-liar()
 {
 	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
-	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
+	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
                             //         faces to get in the front door, and unidentified callers won't fair
                             //         any better. You entered *MY* phone number. That won't work.
                             //         If you are telemarketing, cross me off the list, and don't call again.
                             //         If you did this by mistake, forgive my defenses, and call again.
                            // Alternate: (priv-liar2)
 				   // Script: You have chosen to try to deceive my system and withold your CallerID,
-                                   //           by entering my own phone number as YOUR CallerID. I find this 
+                                   //           by entering my own phone number as YOUR CallerID. I find this
                                    //           offensive because you are being dishonest. I will not do business nor
                                    //           waste my time talking to anyone who is less than honest and forthcoming.
                                    //           Take me off your call list and do not call me again.
@@ -2074,7 +2074,7 @@ macro callerid-bad()
 context privacyManagerFailed {
  	s => {
 		begin:
- 		Background(PrivManInstructions);  // Script: OOps, that didn't go well. You need to enter *your* area code, and *your* 7 digit 
+ 		Background(PrivManInstructions);  // Script: OOps, that didn't go well. You need to enter *your* area code, and *your* 7 digit
                                                // phone number, for a total of 10 digits, or you'll be handed over to the monkeys. Let's
                                                // try this again, and hopefully you can get past our front-line defenses!
  		PrivacyManager();
@@ -2154,13 +2154,13 @@ context homeline {
 			}
 		}
 	loopback:
-		ifTime(*|*|20-25|dec) 
-		{ 
-			Playback(greetings/christmas); 
+		ifTime(*|*|20-25|dec)
+		{
+			Playback(greetings/christmas);
 		}
-		else ifTime(*|*|31|dec) 
-		{	 
-			Playback(greetings/newyear); 
+		else ifTime(*|*|31|dec)
+		{
+			Playback(greetings/newyear);
 		}
 		else ifTime(*|*|1|jan)
 		{
@@ -2170,15 +2170,15 @@ context homeline {
 		{
 			Playback(greetings/valentines);
 		}
-		else ifTime(*|*|17|mar) 
+		else ifTime(*|*|17|mar)
 		{
 			Playback(greetings/stPat);
 		}
-		else ifTime(*|*|31|oct) 
+		else ifTime(*|*|31|oct)
 		{
 			Playback(greetings/halloween);
 		}
-		else ifTime(*|mon|15-21|jan) 
+		else ifTime(*|mon|15-21|jan)
 		{
 			Playback(greetings/mlkDay);
 		}
@@ -2205,11 +2205,11 @@ context homeline {
 		else ifTime(*|sun|15-21|jun)
 		{
 			Playback(greetings/fathers);
-		} 
-		else 
+		}
+		else
 		{
 			Playback(greetings/hello);   // None of the above? Just a plain hello will do
-		}  
+		}
 		Background(murphy-homeline-intro1);  // Script: Hello-- Welcome to the Murphy's! If you already know what
                                                 //  option you want, you don't have to wait for this entire spiel-- just
                                                 //  have at it.
@@ -2220,7 +2220,7 @@ context homeline {
 						//  to play with your introduction, dial 5.
                                                 //  If we don't seem to be giving you the time of day, try 7.
                                                 //  Have a good day!
-		
+
 	}
 	1 => {  // Sonya
 			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
@@ -2238,7 +2238,7 @@ context homeline {
 			&std-priv-exten(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket);
 			goto s|loopback;
 	}
-	4 => {  // Voicemail 
+	4 => {  // Voicemail
 			VoicemailMain();
 			goto s|loopback;
 	}
@@ -2363,7 +2363,7 @@ context home-introduction-record {
 	begin:
 		Background(intro-record-choices);    // Script:
 				//      If you want some advice about recording your
-				// 	introduction, dial 1. 
+				// 	introduction, dial 1.
 				//      otherwise, dial 2, and introduce yourself after
 				//      the beep.
 	}
@@ -2374,10 +2374,10 @@ context home-introduction-record {
 				//	This is NOT meant to be a voice mail message, so
 				//	please, don't say anything about why you are calling.
 				//	After we are done making the recording, your introduction
-				//	will be saved for playback. 
-				//	If you are the only person that would call from this number, 
+				//	will be saved for playback.
+				//	If you are the only person that would call from this number,
 				//	please state your name.  Otherwise, state your business
-				//	or residence name instead. For instance, if you are 
+				//	or residence name instead. For instance, if you are
 				//	friend of the family, say, Olie McPherson, and both
 				//	you and your kids might call here a lot, you might
 				//	say: "This is the distinguished Olie McPherson Residence!"
@@ -2388,8 +2388,8 @@ context home-introduction-record {
 				//	"John, from the Park County Morgue. You stab 'em, we slab 'em!".
 				//	Just one caution: the kids will hear what you record every time
 				//	you call. So watch your language!
-				//	I will begin recording after the tone. 
-				//	When you are done, hit the # key. Gather your thoughts and get 
+				//	I will begin recording after the tone.
+				//	When you are done, hit the # key. Gather your thoughts and get
 				//	ready. Remember, the # key will end the recording, and play back
 				//      your intro. Good Luck, and Thank you!"
 		goto 2|begin;
@@ -2432,7 +2432,7 @@ context homeline-kids {
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			Voicemail(u4);
 			goto homeline|s|loopback;
-			
+
 			// SetMusicOnHold(erics);
 			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
@@ -2456,7 +2456,7 @@ context homeline-kids {
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
-			
+
 	}
 	6 => {
 			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
@@ -2519,12 +2519,12 @@ context workline {
 	1 => {
 		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
-		
+
 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
-		goto s|loopback;		
+		goto s|loopback;
 	}
 	4 => {
-		VoicemailMain(); 
+		VoicemailMain();
 		goto s|loopback;
 	}
 	6 => {
@@ -2543,7 +2543,7 @@ context workline {
 		Hangup();
 	}
 	i => {
-		Background(invalid); 
+		Background(invalid);
 		goto s|loopback;
 	}
 	o => {
@@ -2827,7 +2827,7 @@ context homeext {
 		Wait(2);
 		Playtones(info);
 		Wait(5);
-		Hangup();	
+		Hangup();
 	}
 	790 => {
 		MeetMe(790,p);
@@ -3180,5 +3180,3 @@ context announce-all {
 // now include the telemarketer torture scripts!
 
 #include "telemarket_torture.ael2"
-
-
diff --git a/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2 b/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
index ebd8e9f2f..1f6ffed83 100755
--- a/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
+++ b/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
@@ -16,7 +16,7 @@
 
 // WORSE DESIGN: Instead of using the Background application, the Playback
 //               application is used. After taking so much time and trouble
-//               to record this material, the caller must listen and enjoy 
+//               to record this material, the caller must listen and enjoy
 //               every syllable before they can make an option choice. None
 //               of that interrupting with a choice. We want them to savour
 //               every word!
@@ -29,18 +29,18 @@
 context telemarket {
 	s => {
 		begin:
-		Playback(telemarketer-intro);       // ; Script: 
+		Playback(telemarketer-intro);       // ; Script:
                                                // Due to the extremely high volume of calls from everything from telemarketers
                                                // to Septic System Bacteria vendors, we are asking all such organizations
                                                //  to remove this number from their call list,  or  as need be, to add this
-                                               //  number to their No-Call list, whichever is relevent. 
+                                               //  number to their No-Call list, whichever is relevent.
 
                                                //  [THE CARROT:]
                                                // We HAVE made some exceptions, and if you wish to see if your organization
                                                // has been exempted, please listen to and follow the following prompts.
-                                               // 
+                                               //
                                                //  Otherwise, please Cease calling this number!
-                                               // 
+                                               //
 		Playback(telemarketer-choices);
                                                //  if you represent a charitable organization, please dial 1,
                                                //  if you represent a political organization, please dial 2.
@@ -70,22 +70,22 @@ context telemarket-charity {
                                                // have sold our name and phone number to each other until we are now hounded
                                                // day and night by literally hundreds of such organizations.
                                                // Enough is Enough!
-                                               // 
-                                               // If we have contributed to your cause in the past, we may, perhaps, be disposed to 
+                                               //
+                                               // If we have contributed to your cause in the past, we may, perhaps, be disposed to
                                                // do so in the future, at our option,
                                                // we give no pledges nor make any commitments here.
                                                // Send us material via the post if you feel this necessary
                                                //  but do not even consider email. Any email or further phone calls from your organization
-                                               // in the future, will be considered an act of aggression, and we will 
+                                               // in the future, will be considered an act of aggression, and we will
                                                //  blacklist your organization for the rest of our natural lives.
-                                               // 
+                                               //
                                                // To see if your organization is exempt from these prohibitions, please
                                                // comply with the following options.
 		Playback(telemark-charity-choices);
                                                // If your organization is disease or genetic defect related, dial 1,
                                                // If your organization is handicap related, dial 2.
                                                // If your organization is a police or fireman or other similar support entity,  please dial 3.
-                                               // If your organization is a grade school to high school related 
+                                               // If your organization is a grade school to high school related
                                                //        fund raiser or other type of activity,  please dial 4.
                                                // If your organization is a college or univerity or alumnis organization,  please dial 5.
                                                // If your organization is animal rights or ecology related organization, please dial 6.
@@ -176,7 +176,7 @@ context telemarket-char-other {
 context telemarket-sorry {
 	s => {
 		begin:
-		Playback(telemarket-sorry); 
+		Playback(telemarket-sorry);
                                                // Sorry -- your organization is not exempt. Please stop calling us.
                                                //  Thank you. goodbye.
 		Hangup();
@@ -190,7 +190,7 @@ context telemarket-exception {
 	s => {
 		begin:
 		Playback(telemarket-success);
-                                               // Congratulations. Your organization IS exempt. Please call us back, 
+                                               // Congratulations. Your organization IS exempt. Please call us back,
                                                // but this time, just act like a normal caller. Thank you. Goodbye.
 		Hangup();
 	}
@@ -244,7 +244,7 @@ context telemarket-political2 {
 		Playback(telemark-politx-intro);
                                                // Thank you for your patience, and I congratulate you for your persistence.
                                                // Just a few more options!
-                                               // 
+                                               //
 		Playback(telemark-polit2-choices);
                                                //  if You represent the Communist Party USA, dial 1.
                                                //  if You represent the Constitution Party, dial 2.
@@ -644,7 +644,7 @@ context telemarket-pollster {
 	s => {
 		begin:
 		Playback(telemark-poll-intro);
-                                               // I'm sorry-- We are just not available for doing any polling at the moment. So, 
+                                               // I'm sorry-- We are just not available for doing any polling at the moment. So,
                                                // please remove us from your list.
 		goto telemarket-sorry|s|begin;
 	}
@@ -660,7 +660,7 @@ context telemarket-research {
 		Playback(telemark-research-intro);
                                                // I'd like to say I'd love to help you with your market survey, but that would be a complete
                                                // and total lie. I am not interested in helping you with Market Surveys.
-                                               // 
+                                               //
                                                // Please remove me from your call list. It just doesn't pay enough. But Thank you.
 		goto telemarket-sorry|s|begin;
 	}
@@ -674,12 +674,12 @@ context telemarket-magazine {
 	s => {
 		begin:
 		Playback(telemark-mag-choices);
-                                               // If you are calling to see if I would like a NEW free subscription 
+                                               // If you are calling to see if I would like a NEW free subscription
                                                // to your magazine or newsletter, please dial 1.
                                                // If you are calling to see if I want to Renew an existing subscription, please dial 2.
                                                // If you are representing some publisher, and want my opinion about something, or are doing
                                                // some kind of survey, please dial 3.
-                                               // If you are calling to verify that some previous caller actually called me, and the 
+                                               // If you are calling to verify that some previous caller actually called me, and the
                                                // verification information is correct, please dial 4.
                                                // and if your call purpose doesn't match any of the above, please dial 5.
 	}
@@ -698,8 +698,8 @@ context telemark-mag-new {
 	s => {
 		begin:
 		Playback(telemark-mag-new);
-                                               // I'm sorry, I'm maxed out, and the answer is NO. 
-                                               // If you really think I'd LOVE to add your publication to the pile I already get, 
+                                               // I'm sorry, I'm maxed out, and the answer is NO.
+                                               // If you really think I'd LOVE to add your publication to the pile I already get,
                                                // Send something via the post. Don't call me.
                                                //  Thank you. bye.
 		Hangup();
@@ -715,9 +715,9 @@ context telemark-mag-renew {
 		begin:
 		Playback(telemark-mag-renew);
                                                // So, you want to see if I want to Renew, do you?  The answer is most likely "YES".
-                                               // 
-                                               // But, I will not answer a long list of questions over the phone. Send such 
-                                               // categorization info via the post, and stop bothering me over the phone, 
+                                               //
+                                               // But, I will not answer a long list of questions over the phone. Send such
+                                               // categorization info via the post, and stop bothering me over the phone,
                                                // if this is what you want.
                                                // Do you need verification information? Normally I opt out of such nonsense, if possible.
                                                // If not, use whatever of the following you can:
@@ -752,7 +752,7 @@ context telemark-mag-verify {
 		begin:
 		Playback(telemark-mag-verify);
                                                // If you are calling to verify that your own agents aren't ripping you off,
-                                               // sorry, I can't help you. I opt out whenever I can, mainly because I'm not 
+                                               // sorry, I can't help you. I opt out whenever I can, mainly because I'm not
                                                // paid enough for this kind of thing. I always lie, and I can't remember
                                                // what I might have said. Sorry. Goodbye.
 		Hangup();
@@ -785,7 +785,7 @@ context telemarket-commercial {
 		begin:
 		Playback(telemark-comm-intro); // Script: Please leave your name, organization, and phone number, plus
                                             // a short description of the purpose of your call, at the prompt.
-                                            // We will do our best to respond to your call! And, in the mean time, 
+                                            // We will do our best to respond to your call! And, in the mean time,
                                             // do not forget to add us to your no-call list!
 		Voicemail(u82);
 		goto telemarket-sorry|s|begin;
@@ -801,7 +801,7 @@ context telemarket-other {
 		begin:
 		Playback(telemark-other-intro);
                                               // Please review the previous menu options, and see if you really don't
-                                              // fit in one of the previous categories. 
+                                              // fit in one of the previous categories.
                                               // If you do not, go ahead, and call me again, and let me know what category
                                               //  I should have included in the above list. I appreciate this. Thank you much!
 		Hangup();
diff --git a/pbx/ael/ael-test/ael-test4/extensions.ael b/pbx/ael/ael-test/ael-test4/extensions.ael
index 838aa2489..29868d840 100644
--- a/pbx/ael/ael-test/ael-test4/extensions.ael
+++ b/pbx/ael/ael-test/ael-test4/extensions.ael
@@ -1,8 +1,7 @@
 context test1
 {
-	test2 => 
+	test2 =>
 	{
 		#include "apptest.ael2";
 	}
 }
-
diff --git a/pbx/ael/ael-test/ael-test7/extensions.ael b/pbx/ael/ael-test/ael-test7/extensions.ael
index 27ed374f5..e951bf29a 100644
--- a/pbx/ael/ael-test/ael-test7/extensions.ael
+++ b/pbx/ael/ael-test/ael-test7/extensions.ael
@@ -63,7 +63,7 @@ macro checkanddial(prov,proto,ext,arg1,arg2,arg3,arg4) {
 
 	if(${DB_EXISTS(Provider/${prov}/used)})
 		Set(MINUTES_USED=${DB_RESULT});
-	
+
 	country_c = 0;
 	switch(${LEN(${ext})}) {	//assuming all international numbers are 11 digits long.
 	case 10:			//NXXNXXXXXX
@@ -76,7 +76,7 @@ macro checkanddial(prov,proto,ext,arg1,arg2,arg3,arg4) {
 		country_c = ${ext:3:1};
 		break;
 	};
-		
+
 	if("${prov}" = "${TRUNK}" & ${country_c} != 1) {	// SunRocket international calls
 		Set(MINUTES_LIMIT=${DB(Provider/${prov}/limit)});
 		&announce_minutes($[${MINUTES_LIMIT} - ${MINUTES_USED}]);
@@ -258,7 +258,7 @@ context outbound {
 	_012. => {	//fwdOUT
 		Set(CALLERID(name)=Central NJ);
 		Dial(IAX2/14301@fwdOUT/q${EXTEN:3},60,T);
-	};                     
+	};
 	_013X. => {	//NECC
 		Dial(${PSTNPROTO}/011${EXTEN:3}@${PSTN},60,T);
 	};
@@ -339,7 +339,7 @@ context tario.net-in {
 		} else if("${SIP_HEADER(To)}" = "<sip:2271653@sipnet.ru>") {
 			jump 1@default;
 		} else
-			jump 2@default;                                                     
+			jump 2@default;
 	};
 };
 
@@ -457,4 +457,3 @@ instructions:
 	t => jump #;
 	i => Playback(invalid);
 };
-
diff --git a/pbx/ael/ael-test/ael-test8/extensions.ael b/pbx/ael/ael-test/ael-test8/extensions.ael
index 17bc74e6f..290444aaa 100644
--- a/pbx/ael/ael-test/ael-test8/extensions.ael
+++ b/pbx/ael/ael-test/ael-test8/extensions.ael
@@ -24,4 +24,3 @@ context default
          };
 
 }
-
diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
index b7e953e62..2d2ec12ca 100755
--- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
+++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
@@ -11,10 +11,10 @@ globals
 	FWDVMBOX=1 ;                // the VM box for this user
 }
 
-macro std-exten( ext , dev ) 
+macro std-exten( ext , dev )
 {
         Dial(${dev}/${ext},20);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case BUSY:
                 Voicemail(b${ext});
@@ -32,11 +32,11 @@ macro std-exten( ext , dev )
         }
 }
 
-macro std-priv-exten_1( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_1( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -58,11 +58,11 @@ macro std-priv-exten_1( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_2( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_2( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -84,11 +84,11 @@ macro std-priv-exten_2( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_3( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_3( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -110,11 +110,11 @@ macro std-priv-exten_3( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_4( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_4( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -136,11 +136,11 @@ macro std-priv-exten_4( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_5( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_5( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -162,11 +162,11 @@ macro std-priv-exten_5( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_6( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_6( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -188,11 +188,11 @@ macro std-priv-exten_6( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_7( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_7( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -214,11 +214,11 @@ macro std-priv-exten_7( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_8( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_8( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -240,11 +240,11 @@ macro std-priv-exten_8( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_9( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_9( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -266,11 +266,11 @@ macro std-priv-exten_9( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_10( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_10( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -292,11 +292,11 @@ macro std-priv-exten_10( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_11( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_11( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -318,11 +318,11 @@ macro std-priv-exten_11( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_12( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_12( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -344,11 +344,11 @@ macro std-priv-exten_12( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_13( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_13( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -370,11 +370,11 @@ macro std-priv-exten_13( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_14( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_14( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -396,11 +396,11 @@ macro std-priv-exten_14( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_15( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_15( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -422,11 +422,11 @@ macro std-priv-exten_15( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_16( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_16( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -448,11 +448,11 @@ macro std-priv-exten_16( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_17( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_17( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -474,11 +474,11 @@ macro std-priv-exten_17( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_18( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_18( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -500,11 +500,11 @@ macro std-priv-exten_18( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_19( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_19( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -526,11 +526,11 @@ macro std-priv-exten_19( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_20( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_20( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -552,11 +552,11 @@ macro std-priv-exten_20( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_21( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_21( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -578,11 +578,11 @@ macro std-priv-exten_21( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_22( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_22( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -604,11 +604,11 @@ macro std-priv-exten_22( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_23( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_23( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -630,11 +630,11 @@ macro std-priv-exten_23( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_24( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_24( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -656,11 +656,11 @@ macro std-priv-exten_24( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_25( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_25( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -682,11 +682,11 @@ macro std-priv-exten_25( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_26( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_26( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -708,11 +708,11 @@ macro std-priv-exten_26( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_27( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_27( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -734,11 +734,11 @@ macro std-priv-exten_27( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_28( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_28( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -760,11 +760,11 @@ macro std-priv-exten_28( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_29( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_29( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -786,11 +786,11 @@ macro std-priv-exten_29( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_30( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_30( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -812,11 +812,11 @@ macro std-priv-exten_30( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_31( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_31( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -838,11 +838,11 @@ macro std-priv-exten_31( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_32( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_32( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -864,11 +864,11 @@ macro std-priv-exten_32( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_33( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_33( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -890,11 +890,11 @@ macro std-priv-exten_33( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_34( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_34( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -916,11 +916,11 @@ macro std-priv-exten_34( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_35( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_35( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -942,11 +942,11 @@ macro std-priv-exten_35( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_36( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_36( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -968,11 +968,11 @@ macro std-priv-exten_36( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_37( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_37( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -994,11 +994,11 @@ macro std-priv-exten_37( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_38( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_38( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1020,11 +1020,11 @@ macro std-priv-exten_38( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_39( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_39( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1046,11 +1046,11 @@ macro std-priv-exten_39( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_40( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_40( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1072,11 +1072,11 @@ macro std-priv-exten_40( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_41( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_41( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1098,11 +1098,11 @@ macro std-priv-exten_41( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_42( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_42( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1124,11 +1124,11 @@ macro std-priv-exten_42( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_43( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_43( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1150,11 +1150,11 @@ macro std-priv-exten_43( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_44( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_44( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1176,11 +1176,11 @@ macro std-priv-exten_44( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_45( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_45( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1202,11 +1202,11 @@ macro std-priv-exten_45( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_46( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_46( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1228,11 +1228,11 @@ macro std-priv-exten_46( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_47( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_47( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1254,11 +1254,11 @@ macro std-priv-exten_47( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_48( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_48( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1280,11 +1280,11 @@ macro std-priv-exten_48( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_49( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_49( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1306,11 +1306,11 @@ macro std-priv-exten_49( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_50( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_50( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1332,11 +1332,11 @@ macro std-priv-exten_50( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_51( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_51( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1358,11 +1358,11 @@ macro std-priv-exten_51( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_52( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_52( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1384,11 +1384,11 @@ macro std-priv-exten_52( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_53( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_53( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1410,11 +1410,11 @@ macro std-priv-exten_53( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_54( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_54( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1436,11 +1436,11 @@ macro std-priv-exten_54( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_55( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_55( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1462,11 +1462,11 @@ macro std-priv-exten_55( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_56( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_56( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1488,11 +1488,11 @@ macro std-priv-exten_56( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_57( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_57( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1514,11 +1514,11 @@ macro std-priv-exten_57( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_58( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_58( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1540,11 +1540,11 @@ macro std-priv-exten_58( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_59( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_59( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1566,11 +1566,11 @@ macro std-priv-exten_59( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_60( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_60( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1592,11 +1592,11 @@ macro std-priv-exten_60( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_61( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_61( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1618,11 +1618,11 @@ macro std-priv-exten_61( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_62( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_62( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1644,11 +1644,11 @@ macro std-priv-exten_62( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_63( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_63( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1670,11 +1670,11 @@ macro std-priv-exten_63( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_64( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_64( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1696,11 +1696,11 @@ macro std-priv-exten_64( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_65( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_65( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1722,11 +1722,11 @@ macro std-priv-exten_65( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_66( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_66( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1748,11 +1748,11 @@ macro std-priv-exten_66( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_67( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_67( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1774,11 +1774,11 @@ macro std-priv-exten_67( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_68( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_68( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1800,11 +1800,11 @@ macro std-priv-exten_68( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_69( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_69( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1826,11 +1826,11 @@ macro std-priv-exten_69( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_70( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_70( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1852,11 +1852,11 @@ macro std-priv-exten_70( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_71( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_71( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1878,11 +1878,11 @@ macro std-priv-exten_71( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_72( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_72( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1904,11 +1904,11 @@ macro std-priv-exten_72( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten_73( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten_73( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1930,11 +1930,11 @@ macro std-priv-exten_73( dev, ext , timeout, opts, torcont, dontcont )
 }
 
 
-macro std-priv-exten( dev, ext , timeout, opts, torcont, dontcont ) 
+macro std-priv-exten( dev, ext , timeout, opts, torcont, dontcont )
 {
         Dial(${dev},${timeout},${opts});
 	NoOp(${DIALSTATUS} was chosen);
-        switch(${DIALSTATUS}) 
+        switch(${DIALSTATUS})
 		{
         case TORTURE:
 		goto ${torcont}|s|begin;
@@ -1962,33 +1962,33 @@ macro fillcidname()
         Set(cidn=${DB(cidname/${CALLERID(num)})});
         if( "${CALLERID(name)}" != "" )
         {
-                if( ("${cidn}" = "Privacy Manager" & "${CALLERID(name)}" != "Privacy Manager") | "${cidn}" = "" ) // if the entry isn't in the database, 
+                if( ("${cidn}" = "Privacy Manager" & "${CALLERID(name)}" != "Privacy Manager") | "${cidn}" = "" ) // if the entry isn't in the database,
                                                                                 // or if an entry exists, and it's "Privacy Manager", empty, (or add other useless possibilities).
-                { 
+                {
                        Set(DB(cidname/${CALLERID(num)})=${CALLERID(name)});     // then set or override what's in the DB
                 }
         }
         // Now, we fill in the callerid info from the incoming entry, if it's stuff worth using
         // Ignore fundamentally semi-anonymous information from local cell phones
         // if the db has an entry for this number, and it's not a canned string from a cell phone company
-        if(  ( "${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       "  
+        if(  ( "${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      " ) )  // put stuff in the above, that the phone company tends to put in your callerid, 
+                                                  | "${CALLERID(name)}" = "PROVO,UT       "
+                                                  | "${CALLERID(name)}" = "TOLL FREE      " ) )  // put stuff in the above, that the phone company tends to put in your callerid,
                                                                                                  // that you would rather override with DB info
                                                                                                  // there's no way to guess them all, but you can get the most popular ones...
                                                                                                  // why cell phones can't do CID like everybody else, ....?
-        {    
+        {
                 Set(CALLERID(name)=${cidn});  // Override what the phone company provides with what's in the DB for this number.
         }
 }
@@ -2007,7 +2007,7 @@ macro ciddial(dialnum, lookup, waittime, dialopts, ddev)
 		if( "${DIALSTATUS}" = "CHANUNAVAIL" )
 		{
 			BackGround(try_cell);
-			CALLERID(num)=${cidnu}; // put the original number back 
+			CALLERID(num)=${cidnu}; // put the original number back
 			Dial(Zap/2/${lookup},${waittime},${dialopts});
 		}
 	}
@@ -2035,7 +2035,7 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
 	Dial(SIP/1${lookup}@tctwest,${waittime},${dialopts});
 	if( "${DIALSTATUS}" = "CHANUNAVAIL" )
 	{
-		Set(CALLERID(num)=${cidnu}); // put the original number back 
+		Set(CALLERID(num)=${cidnu}); // put the original number back
 		BackGround(try_zap);
 		Dial(${ddev}/${dialnum},${waittime}|${dialopts});
 		if( "${DIALSTATUS}" = "CHANUNAVAIL" )
@@ -2049,14 +2049,14 @@ macro ciddial2(dialnum, lookup, waittime, dialopts, ddev) // give priority to tc
 macro callerid-liar()
 {
 	TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
-	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their 
+	Background(priv-liar);  // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
                             //         faces to get in the front door, and unidentified callers won't fair
                             //         any better. You entered *MY* phone number. That won't work.
                             //         If you are telemarketing, cross me off the list, and don't call again.
                             //         If you did this by mistake, forgive my defenses, and call again.
                            // Alternate: (priv-liar2)
 				   // Script: You have chosen to try to deceive my system and withold your CallerID,
-                                   //           by entering my own phone number as YOUR CallerID. I find this 
+                                   //           by entering my own phone number as YOUR CallerID. I find this
                                    //           offensive because you are being dishonest. I will not do business nor
                                    //           waste my time talking to anyone who is less than honest and forthcoming.
                                    //           Take me off your call list and do not call me again.
@@ -2073,7 +2073,7 @@ macro callerid-bad()
 context privacyManagerFailed {
  	s => {
 		begin:
- 		Background(PrivManInstructions);  // Script: OOps, that didn't go well. You need to enter *your* area code, and *your* 7 digit 
+ 		Background(PrivManInstructions);  // Script: OOps, that didn't go well. You need to enter *your* area code, and *your* 7 digit
                                                // phone number, for a total of 10 digits, or you'll be handed over to the monkeys. Let's
                                                // try this again, and hopefully you can get past our front-line defenses!
  		PrivacyManager();
@@ -2153,13 +2153,13 @@ context homeline {
 			}
 		}
 	loopback:
-		ifTime(*|*|20-25|dec) 
-		{ 
-			Playback(greetings/christmas); 
+		ifTime(*|*|20-25|dec)
+		{
+			Playback(greetings/christmas);
 		}
-		else ifTime(*|*|31|dec) 
-		{	 
-			Playback(greetings/newyear); 
+		else ifTime(*|*|31|dec)
+		{
+			Playback(greetings/newyear);
 		}
 		else ifTime(*|*|1|jan)
 		{
@@ -2169,15 +2169,15 @@ context homeline {
 		{
 			Playback(greetings/valentines);
 		}
-		else ifTime(*|*|17|mar) 
+		else ifTime(*|*|17|mar)
 		{
 			Playback(greetings/stPat);
 		}
-		else ifTime(*|*|31|oct) 
+		else ifTime(*|*|31|oct)
 		{
 			Playback(greetings/halloween);
 		}
-		else ifTime(*|mon|15-21|jan) 
+		else ifTime(*|mon|15-21|jan)
 		{
 			Playback(greetings/mlkDay);
 		}
@@ -2204,11 +2204,11 @@ context homeline {
 		else ifTime(*|sun|15-21|jun)
 		{
 			Playback(greetings/fathers);
-		} 
-		else 
+		}
+		else
 		{
 			Playback(greetings/hello);   // None of the above? Just a plain hello will do
-		}  
+		}
 		Background(murphy-homeline-intro1);  // Script: Hello-- Welcome to the Murphy's! If you already know what
                                                 //  option you want, you don't have to wait for this entire spiel-- just
                                                 //  have at it.
@@ -2219,7 +2219,7 @@ context homeline {
 						//  to play with your introduction, dial 5.
                                                 //  If we don't seem to be giving you the time of day, try 7.
                                                 //  Have a good day!
-		
+
 	}
 	1 => {  // Sonya
 			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
@@ -2237,7 +2237,7 @@ context homeline {
 			&std-priv-exten(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket);
 			goto s|loopback;
 	}
-	4 => {  // Voicemail 
+	4 => {  // Voicemail
 			VoicemailMain();
 			goto s|loopback;
 	}
@@ -2362,7 +2362,7 @@ context home-introduction-record {
 	begin:
 		Background(intro-record-choices);    // Script:
 				//      If you want some advice about recording your
-				// 	introduction, dial 1. 
+				// 	introduction, dial 1.
 				//      otherwise, dial 2, and introduce yourself after
 				//      the beep.
 	}
@@ -2373,10 +2373,10 @@ context home-introduction-record {
 				//	This is NOT meant to be a voice mail message, so
 				//	please, don't say anything about why you are calling.
 				//	After we are done making the recording, your introduction
-				//	will be saved for playback. 
-				//	If you are the only person that would call from this number, 
+				//	will be saved for playback.
+				//	If you are the only person that would call from this number,
 				//	please state your name.  Otherwise, state your business
-				//	or residence name instead. For instance, if you are 
+				//	or residence name instead. For instance, if you are
 				//	friend of the family, say, Olie McPherson, and both
 				//	you and your kids might call here a lot, you might
 				//	say: "This is the distinguished Olie McPherson Residence!"
@@ -2387,8 +2387,8 @@ context home-introduction-record {
 				//	"John, from the Park County Morgue. You stab 'em, we slab 'em!".
 				//	Just one caution: the kids will hear what you record every time
 				//	you call. So watch your language!
-				//	I will begin recording after the tone. 
-				//	When you are done, hit the # key. Gather your thoughts and get 
+				//	I will begin recording after the tone.
+				//	When you are done, hit the # key. Gather your thoughts and get
 				//	ready. Remember, the # key will end the recording, and play back
 				//      your intro. Good Luck, and Thank you!"
 		goto 2|begin;
@@ -2431,7 +2431,7 @@ context homeline-kids {
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
 			Voicemail(u4);
 			goto homeline|s|loopback;
-			
+
 			// SetMusicOnHold(erics);
 			// TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 			// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
@@ -2455,7 +2455,7 @@ context homeline-kids {
 			TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
 			&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
 			goto homeline|s|loopback;
-			
+
 	}
 	6 => {
 			TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
@@ -2518,12 +2518,12 @@ context workline {
 	1 => {
 		TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
 		TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
-		
+
 		&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
-		goto s|loopback;		
+		goto s|loopback;
 	}
 	4 => {
-		VoicemailMain(); 
+		VoicemailMain();
 		goto s|loopback;
 	}
 	6 => {
@@ -2542,7 +2542,7 @@ context workline {
 		Hangup();
 	}
 	i => {
-		Background(invalid); 
+		Background(invalid);
 		goto s|loopback;
 	}
 	o => {
@@ -2826,7 +2826,7 @@ context homeext {
 		Wait(2);
 		Playtones(info);
 		Wait(5);
-		Hangup();	
+		Hangup();
 	}
 	790 => {
 		MeetMe(790,p);
@@ -3179,5 +3179,3 @@ context announce-all {
 // now include the telemarketer torture scripts!
 
 #include "telemarket_torture.ael2"
-
-
diff --git a/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2 b/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2
index ebd8e9f2f..1f6ffed83 100755
--- a/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2
+++ b/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2
@@ -16,7 +16,7 @@
 
 // WORSE DESIGN: Instead of using the Background application, the Playback
 //               application is used. After taking so much time and trouble
-//               to record this material, the caller must listen and enjoy 
+//               to record this material, the caller must listen and enjoy
 //               every syllable before they can make an option choice. None
 //               of that interrupting with a choice. We want them to savour
 //               every word!
@@ -29,18 +29,18 @@
 context telemarket {
 	s => {
 		begin:
-		Playback(telemarketer-intro);       // ; Script: 
+		Playback(telemarketer-intro);       // ; Script:
                                                // Due to the extremely high volume of calls from everything from telemarketers
                                                // to Septic System Bacteria vendors, we are asking all such organizations
                                                //  to remove this number from their call list,  or  as need be, to add this
-                                               //  number to their No-Call list, whichever is relevent. 
+                                               //  number to their No-Call list, whichever is relevent.
 
                                                //  [THE CARROT:]
                                                // We HAVE made some exceptions, and if you wish to see if your organization
                                                // has been exempted, please listen to and follow the following prompts.
-                                               // 
+                                               //
                                                //  Otherwise, please Cease calling this number!
-                                               // 
+                                               //
 		Playback(telemarketer-choices);
                                                //  if you represent a charitable organization, please dial 1,
                                                //  if you represent a political organization, please dial 2.
@@ -70,22 +70,22 @@ context telemarket-charity {
                                                // have sold our name and phone number to each other until we are now hounded
                                                // day and night by literally hundreds of such organizations.
                                                // Enough is Enough!
-                                               // 
-                                               // If we have contributed to your cause in the past, we may, perhaps, be disposed to 
+                                               //
+                                               // If we have contributed to your cause in the past, we may, perhaps, be disposed to
                                                // do so in the future, at our option,
                                                // we give no pledges nor make any commitments here.
                                                // Send us material via the post if you feel this necessary
                                                //  but do not even consider email. Any email or further phone calls from your organization
-                                               // in the future, will be considered an act of aggression, and we will 
+                                               // in the future, will be considered an act of aggression, and we will
                                                //  blacklist your organization for the rest of our natural lives.
-                                               // 
+                                               //
                                                // To see if your organization is exempt from these prohibitions, please
                                                // comply with the following options.
 		Playback(telemark-charity-choices);
                                                // If your organization is disease or genetic defect related, dial 1,
                                                // If your organization is handicap related, dial 2.
                                                // If your organization is a police or fireman or other similar support entity,  please dial 3.
-                                               // If your organization is a grade school to high school related 
+                                               // If your organization is a grade school to high school related
                                                //        fund raiser or other type of activity,  please dial 4.
                                                // If your organization is a college or univerity or alumnis organization,  please dial 5.
                                                // If your organization is animal rights or ecology related organization, please dial 6.
@@ -176,7 +176,7 @@ context telemarket-char-other {
 context telemarket-sorry {
 	s => {
 		begin:
-		Playback(telemarket-sorry); 
+		Playback(telemarket-sorry);
                                                // Sorry -- your organization is not exempt. Please stop calling us.
                                                //  Thank you. goodbye.
 		Hangup();
@@ -190,7 +190,7 @@ context telemarket-exception {
 	s => {
 		begin:
 		Playback(telemarket-success);
-                                               // Congratulations. Your organization IS exempt. Please call us back, 
+                                               // Congratulations. Your organization IS exempt. Please call us back,
                                                // but this time, just act like a normal caller. Thank you. Goodbye.
 		Hangup();
 	}
@@ -244,7 +244,7 @@ context telemarket-political2 {
 		Playback(telemark-politx-intro);
                                                // Thank you for your patience, and I congratulate you for your persistence.
                                                // Just a few more options!
-                                               // 
+                                               //
 		Playback(telemark-polit2-choices);
                                                //  if You represent the Communist Party USA, dial 1.
                                                //  if You represent the Constitution Party, dial 2.
@@ -644,7 +644,7 @@ context telemarket-pollster {
 	s => {
 		begin:
 		Playback(telemark-poll-intro);
-                                               // I'm sorry-- We are just not available for doing any polling at the moment. So, 
+                                               // I'm sorry-- We are just not available for doing any polling at the moment. So,
                                                // please remove us from your list.
 		goto telemarket-sorry|s|begin;
 	}
@@ -660,7 +660,7 @@ context telemarket-research {
 		Playback(telemark-research-intro);
                                                // I'd like to say I'd love to help you with your market survey, but that would be a complete
                                                // and total lie. I am not interested in helping you with Market Surveys.
-                                               // 
+                                               //
                                                // Please remove me from your call list. It just doesn't pay enough. But Thank you.
 		goto telemarket-sorry|s|begin;
 	}
@@ -674,12 +674,12 @@ context telemarket-magazine {
 	s => {
 		begin:
 		Playback(telemark-mag-choices);
-                                               // If you are calling to see if I would like a NEW free subscription 
+                                               // If you are calling to see if I would like a NEW free subscription
                                                // to your magazine or newsletter, please dial 1.
                                                // If you are calling to see if I want to Renew an existing subscription, please dial 2.
                                                // If you are representing some publisher, and want my opinion about something, or are doing
                                                // some kind of survey, please dial 3.
-                                               // If you are calling to verify that some previous caller actually called me, and the 
+                                               // If you are calling to verify that some previous caller actually called me, and the
                                                // verification information is correct, please dial 4.
                                                // and if your call purpose doesn't match any of the above, please dial 5.
 	}
@@ -698,8 +698,8 @@ context telemark-mag-new {
 	s => {
 		begin:
 		Playback(telemark-mag-new);
-                                               // I'm sorry, I'm maxed out, and the answer is NO. 
-                                               // If you really think I'd LOVE to add your publication to the pile I already get, 
+                                               // I'm sorry, I'm maxed out, and the answer is NO.
+                                               // If you really think I'd LOVE to add your publication to the pile I already get,
                                                // Send something via the post. Don't call me.
                                                //  Thank you. bye.
 		Hangup();
@@ -715,9 +715,9 @@ context telemark-mag-renew {
 		begin:
 		Playback(telemark-mag-renew);
                                                // So, you want to see if I want to Renew, do you?  The answer is most likely "YES".
-                                               // 
-                                               // But, I will not answer a long list of questions over the phone. Send such 
-                                               // categorization info via the post, and stop bothering me over the phone, 
+                                               //
+                                               // But, I will not answer a long list of questions over the phone. Send such
+                                               // categorization info via the post, and stop bothering me over the phone,
                                                // if this is what you want.
                                                // Do you need verification information? Normally I opt out of such nonsense, if possible.
                                                // If not, use whatever of the following you can:
@@ -752,7 +752,7 @@ context telemark-mag-verify {
 		begin:
 		Playback(telemark-mag-verify);
                                                // If you are calling to verify that your own agents aren't ripping you off,
-                                               // sorry, I can't help you. I opt out whenever I can, mainly because I'm not 
+                                               // sorry, I can't help you. I opt out whenever I can, mainly because I'm not
                                                // paid enough for this kind of thing. I always lie, and I can't remember
                                                // what I might have said. Sorry. Goodbye.
 		Hangup();
@@ -785,7 +785,7 @@ context telemarket-commercial {
 		begin:
 		Playback(telemark-comm-intro); // Script: Please leave your name, organization, and phone number, plus
                                             // a short description of the purpose of your call, at the prompt.
-                                            // We will do our best to respond to your call! And, in the mean time, 
+                                            // We will do our best to respond to your call! And, in the mean time,
                                             // do not forget to add us to your no-call list!
 		Voicemail(u82);
 		goto telemarket-sorry|s|begin;
@@ -801,7 +801,7 @@ context telemarket-other {
 		begin:
 		Playback(telemark-other-intro);
                                               // Please review the previous menu options, and see if you really don't
-                                              // fit in one of the previous categories. 
+                                              // fit in one of the previous categories.
                                               // If you do not, go ahead, and call me again, and let me know what category
                                               //  I should have included in the above list. I appreciate this. Thank you much!
 		Hangup();
diff --git a/pbx/ael/ael-test/ael-vtest17/extensions.ael b/pbx/ael/ael-test/ael-vtest17/extensions.ael
index d13fe99d7..8f4c7d39a 100644
--- a/pbx/ael/ael-test/ael-vtest17/extensions.ael
+++ b/pbx/ael/ael-test/ael-vtest17/extensions.ael
@@ -1,12 +1,12 @@
 context dialextens
 {
-	/* 
+	/*
 		101 thru 123, 149 thru 152
         */
 	_10X => Dial(Zap/${EXTEN:2},30,tw);
 	_1ZX => Dial(Zap/${EXTEN:1},30,tw);
 }
-/* 
+/*
     Due to extenal wiring:
 
   dialing 125 will ring 101
@@ -90,7 +90,7 @@ context extension
 			Verbose(Finished 100000 levels deep call!);
 		}
 	83 => {
-		switch (${EXTEN}) 
+		switch (${EXTEN})
 		{
 		pattern 8X:
     			Verbose(do something to prepare it);
diff --git a/pbx/ael/ael-test/ael-vtest21/extensions.ael b/pbx/ael/ael-test/ael-vtest21/extensions.ael
index 95f25302a..a5e7436e6 100644
--- a/pbx/ael/ael-test/ael-vtest21/extensions.ael
+++ b/pbx/ael/ael-test/ael-vtest21/extensions.ael
@@ -11,4 +11,3 @@ context from-enum {
         goto ${EXTEN:3}|1;
   }
 }
-
diff --git a/pbx/ael/ael-test/runtests b/pbx/ael/ael-test/runtests
index 9209f0a54..f9b29f571 100755
--- a/pbx/ael/ael-test/runtests
+++ b/pbx/ael/ael-test/runtests
@@ -41,7 +41,7 @@ done
 for i in ael-vtest*; do
 	echo -n Test: $i.................
 	(cd $i; ../../../../utils/aelparse -d -w -n | grep -v -i 'seconds' > ../res2.$i)
-	
+
 	if (diff -q ref.$i $i/extensions.conf.aeldump  > /dev/null 2>&1 ) then
 		echo PASSED
 		rm res2.$i