diff --git a/tests/test.cmp b/tests/test.cmp
index 41a5f502..3ff77cca 100644
--- a/tests/test.cmp
+++ b/tests/test.cmp
@@ -20,10 +20,75 @@ REM Wed UNTIL 15 Feb 1991 SATISFY [trigdate() > '1990-01-01'] MSG wookie
 REM AT 0:00 0:01 0:02 MSG foo
 ../tests/test.rem(16): Time specified twice
 
-REM MSG Today is [hebday(today())] [hebmon(today())] [hebyear(today())]
-../tests/test.rem(18): Trig = Saturday, 16 February, 1991
+# Includecmd
+INCLUDECMD echo REM 16 Feb 1991 MSG Blork
+REM 16 Feb 1991 MSG Blork
+
+REM 16 Feb 1991 MSG Blork
+../tests/test.rem//cmd//19(1): Trig = Saturday, 16 February, 1991
 Reminders for Saturday, 16th February, 1991:
 
+Blork
+
+INCLUDECMD echo REM 18 Feb 1991 MSG Blork
+REM 18 Feb 1991 MSG Blork
+
+REM 18 Feb 1991 MSG Blork
+../tests/test.rem//cmd//20(1): Trig = Monday, 18 February, 1991
+
+# This should work
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo MSG Yippee
+MSG Yippee
+
+MSG Yippee
+../tests/test.rem//cmd//23//cmd//1//cmd//1//cmd//1//cmd//1//cmd//1//cmd//1(1): Trig = Saturday, 16 February, 1991
+Yippee
+
+
+# This should fail
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo INCLUDECMD echo MSG Yippee
+INCLUDECMD echo MSG Yippee
+
+INCLUDECMD echo MSG Yippee
+../tests/test.rem//cmd//26//cmd//1//cmd//1//cmd//1//cmd//1//cmd//1//cmd//1(1): INCLUDE nested too deeply
+REM MSG Today is [hebday(today())] [hebmon(today())] [hebyear(today())]
+../tests/test.rem(27): Trig = Saturday, 16 February, 1991
 today() => 1991-02-16
 hebday(1991-02-16) => 2
 today() => 1991-02-16
@@ -41,7 +106,7 @@ y => "Tishrey"
 hebdate(1, "Tishrey") => 1991-09-09
 trigger(1991-09-09) => "9 September 1991"
 Leaving UserFN _h() => "9 September 1991"
-../tests/test.rem(21): Trig = Monday, 9 September, 1991
+../tests/test.rem(30): Trig = Monday, 9 September, 1991
 [_h(2,  "Tishrey")] MSG Rosh Hashana 2
 Entering UserFN _h(2, "Tishrey")
 x => 2
@@ -49,7 +114,7 @@ y => "Tishrey"
 hebdate(2, "Tishrey") => 1991-09-10
 trigger(1991-09-10) => "10 September 1991"
 Leaving UserFN _h() => "10 September 1991"
-../tests/test.rem(22): Trig = Tuesday, 10 September, 1991
+../tests/test.rem(31): Trig = Tuesday, 10 September, 1991
 [_h(3,  "Tishrey")] MSG Tzom Gedalia
 Entering UserFN _h(3, "Tishrey")
 x => 3
@@ -57,7 +122,7 @@ y => "Tishrey"
 hebdate(3, "Tishrey") => 1991-09-11
 trigger(1991-09-11) => "11 September 1991"
 Leaving UserFN _h() => "11 September 1991"
-../tests/test.rem(23): Trig = Wednesday, 11 September, 1991
+../tests/test.rem(32): Trig = Wednesday, 11 September, 1991
 [_h(10, "Tishrey")] MSG Yom Kippur
 Entering UserFN _h(10, "Tishrey")
 x => 10
@@ -65,7 +130,7 @@ y => "Tishrey"
 hebdate(10, "Tishrey") => 1991-09-18
 trigger(1991-09-18) => "18 September 1991"
 Leaving UserFN _h() => "18 September 1991"
-../tests/test.rem(24): Trig = Wednesday, 18 September, 1991
+../tests/test.rem(33): Trig = Wednesday, 18 September, 1991
 [_h(15, "Tishrey")] MSG Sukkot 1
 Entering UserFN _h(15, "Tishrey")
 x => 15
@@ -73,7 +138,7 @@ y => "Tishrey"
 hebdate(15, "Tishrey") => 1991-09-23
 trigger(1991-09-23) => "23 September 1991"
 Leaving UserFN _h() => "23 September 1991"
-../tests/test.rem(25): Trig = Monday, 23 September, 1991
+../tests/test.rem(34): Trig = Monday, 23 September, 1991
 [_h(25, "Kislev")]  MSG Channuka
 Entering UserFN _h(25, "Kislev")
 x => 25
@@ -81,7 +146,7 @@ y => "Kislev"
 hebdate(25, "Kislev") => 1991-12-02
 trigger(1991-12-02) => "2 December 1991"
 Leaving UserFN _h() => "2 December 1991"
-../tests/test.rem(26): Trig = Monday, 2 December, 1991
+../tests/test.rem(35): Trig = Monday, 2 December, 1991
 [_h(10, "Tevet")]   MSG Asara B'Tevet
 Entering UserFN _h(10, "Tevet")
 x => 10
@@ -89,7 +154,7 @@ y => "Tevet"
 hebdate(10, "Tevet") => 1991-12-17
 trigger(1991-12-17) => "17 December 1991"
 Leaving UserFN _h() => "17 December 1991"
-../tests/test.rem(27): Trig = Tuesday, 17 December, 1991
+../tests/test.rem(36): Trig = Tuesday, 17 December, 1991
 [_h(15, "Shvat")]   MSG Tu B'Shvat
 Entering UserFN _h(15, "Shvat")
 x => 15
@@ -97,7 +162,7 @@ y => "Shvat"
 hebdate(15, "Shvat") => 1992-01-20
 trigger(1992-01-20) => "20 January 1992"
 Leaving UserFN _h() => "20 January 1992"
-../tests/test.rem(28): Trig = Monday, 20 January, 1992
+../tests/test.rem(37): Trig = Monday, 20 January, 1992
 [_h(15, "Adar A")]  MSG Purim Katan
 Entering UserFN _h(15, "Adar A")
 x => 15
@@ -105,7 +170,7 @@ y => "Adar A"
 hebdate(15, "Adar A") => 1992-02-19
 trigger(1992-02-19) => "19 February 1992"
 Leaving UserFN _h() => "19 February 1992"
-../tests/test.rem(29): Trig = Wednesday, 19 February, 1992
+../tests/test.rem(38): Trig = Wednesday, 19 February, 1992
 [_h(14, "Adar")]    MSG Purim
 Entering UserFN _h(14, "Adar")
 x => 14
@@ -113,7 +178,7 @@ y => "Adar"
 hebdate(14, "Adar") => 1991-02-28
 trigger(1991-02-28) => "28 February 1991"
 Leaving UserFN _h() => "28 February 1991"
-../tests/test.rem(30): Trig = Thursday, 28 February, 1991
+../tests/test.rem(39): Trig = Thursday, 28 February, 1991
 [_h(15, "Nisan")]   MSG Pesach
 Entering UserFN _h(15, "Nisan")
 x => 15
@@ -121,7 +186,7 @@ y => "Nisan"
 hebdate(15, "Nisan") => 1991-03-30
 trigger(1991-03-30) => "30 March 1991"
 Leaving UserFN _h() => "30 March 1991"
-../tests/test.rem(31): Trig = Saturday, 30 March, 1991
+../tests/test.rem(40): Trig = Saturday, 30 March, 1991
 [_h(27, "Nisan")]   MSG Yom HaShoah
 Entering UserFN _h(27, "Nisan")
 x => 27
@@ -129,7 +194,7 @@ y => "Nisan"
 hebdate(27, "Nisan") => 1991-04-11
 trigger(1991-04-11) => "11 April 1991"
 Leaving UserFN _h() => "11 April 1991"
-../tests/test.rem(32): Trig = Thursday, 11 April, 1991
+../tests/test.rem(41): Trig = Thursday, 11 April, 1991
 [_h(4,  "Iyar")]    MSG Yom HaZikaron
 Entering UserFN _h(4, "Iyar")
 x => 4
@@ -137,7 +202,7 @@ y => "Iyar"
 hebdate(4, "Iyar") => 1991-04-18
 trigger(1991-04-18) => "18 April 1991"
 Leaving UserFN _h() => "18 April 1991"
-../tests/test.rem(33): Trig = Thursday, 18 April, 1991
+../tests/test.rem(42): Trig = Thursday, 18 April, 1991
 [_h(5,  "Iyar")]    MSG Yom Ha'atzmaut
 Entering UserFN _h(5, "Iyar")
 x => 5
@@ -145,7 +210,7 @@ y => "Iyar"
 hebdate(5, "Iyar") => 1991-04-19
 trigger(1991-04-19) => "19 April 1991"
 Leaving UserFN _h() => "19 April 1991"
-../tests/test.rem(34): Trig = Friday, 19 April, 1991
+../tests/test.rem(43): Trig = Friday, 19 April, 1991
 [_h(28, "Iyar")]    MSG Yom Yerushalayim
 Entering UserFN _h(28, "Iyar")
 x => 28
@@ -153,7 +218,7 @@ y => "Iyar"
 hebdate(28, "Iyar") => 1991-05-12
 trigger(1991-05-12) => "12 May 1991"
 Leaving UserFN _h() => "12 May 1991"
-../tests/test.rem(35): Trig = Sunday, 12 May, 1991
+../tests/test.rem(44): Trig = Sunday, 12 May, 1991
 [_h(6,  "Sivan")]   MSG Shavuot
 Entering UserFN _h(6, "Sivan")
 x => 6
@@ -161,7 +226,7 @@ y => "Sivan"
 hebdate(6, "Sivan") => 1991-05-19
 trigger(1991-05-19) => "19 May 1991"
 Leaving UserFN _h() => "19 May 1991"
-../tests/test.rem(36): Trig = Sunday, 19 May, 1991
+../tests/test.rem(45): Trig = Sunday, 19 May, 1991
 [_h(9,  "Av")]      MSG Tish'a B'Av
 Entering UserFN _h(9, "Av")
 x => 9
@@ -169,7 +234,7 @@ y => "Av"
 hebdate(9, "Av") => 1991-07-20
 trigger(1991-07-20) => "20 July 1991"
 Leaving UserFN _h() => "20 July 1991"
-../tests/test.rem(37): Trig = Saturday, 20 July, 1991
+../tests/test.rem(46): Trig = Saturday, 20 July, 1991
 
 # Test some jahrzeit cases
 fset _i(x,y,z,a) trigger(hebdate(x,y,z,a))
@@ -183,7 +248,7 @@ a => 5759
 hebdate(30, "Heshvan", 1991-02-16, 5759) => 1991-11-07
 trigger(1991-11-07) => "7 November 1991"
 Leaving UserFN _i() => "7 November 1991"
-../tests/test.rem(41): Trig = Thursday, 7 November, 1991
+../tests/test.rem(50): Trig = Thursday, 7 November, 1991
 [_i(30, "Heshvan", today(), 5760)] MSG Complete-Defective
 today() => 1991-02-16
 Entering UserFN _i(30, "Heshvan", 1991-02-16, 5760)
@@ -194,7 +259,7 @@ a => 5760
 hebdate(30, "Heshvan", 1991-02-16, 5760) => 1991-11-07
 trigger(1991-11-07) => "7 November 1991"
 Leaving UserFN _i() => "7 November 1991"
-../tests/test.rem(42): Trig = Thursday, 7 November, 1991
+../tests/test.rem(51): Trig = Thursday, 7 November, 1991
 [_i(30, "Heshvan", today(), 5761)] MSG Illegal
 today() => 1991-02-16
 Entering UserFN _i(30, "Heshvan", 1991-02-16, 5761)
@@ -202,7 +267,7 @@ x => 30
 y => "Heshvan"
 z => 1991-02-16
 a => 5761
-hebdate(30, "Heshvan", 1991-02-16, 5761) => ../tests/test.rem(43): 30 Heshvan 5761: Invalid Hebrew date
+hebdate(30, "Heshvan", 1991-02-16, 5761) => ../tests/test.rem(52): 30 Heshvan 5761: Invalid Hebrew date
 Invalid Hebrew date
 Leaving UserFN _i() => Invalid Hebrew date
 
@@ -216,7 +281,7 @@ a => 5759
 hebdate(30, "Kislev", 1991-02-16, 5759) => 1991-12-07
 trigger(1991-12-07) => "7 December 1991"
 Leaving UserFN _i() => "7 December 1991"
-../tests/test.rem(45): Trig = Saturday, 7 December, 1991
+../tests/test.rem(54): Trig = Saturday, 7 December, 1991
 [_i(30, "Kislev", today(), 5760)] MSG Complete-Defective
 today() => 1991-02-16
 Entering UserFN _i(30, "Kislev", 1991-02-16, 5760)
@@ -227,7 +292,7 @@ a => 5760
 hebdate(30, "Kislev", 1991-02-16, 5760) => 1991-12-07
 trigger(1991-12-07) => "7 December 1991"
 Leaving UserFN _i() => "7 December 1991"
-../tests/test.rem(46): Trig = Saturday, 7 December, 1991
+../tests/test.rem(55): Trig = Saturday, 7 December, 1991
 [_i(30, "Kislev", today(), 5761)] MSG Illegal
 today() => 1991-02-16
 Entering UserFN _i(30, "Kislev", 1991-02-16, 5761)
@@ -235,7 +300,7 @@ x => 30
 y => "Kislev"
 z => 1991-02-16
 a => 5761
-hebdate(30, "Kislev", 1991-02-16, 5761) => ../tests/test.rem(47): 30 Kislev 5761: Invalid Hebrew date
+hebdate(30, "Kislev", 1991-02-16, 5761) => ../tests/test.rem(56): 30 Kislev 5761: Invalid Hebrew date
 Invalid Hebrew date
 Leaving UserFN _i() => Invalid Hebrew date
 
@@ -249,7 +314,7 @@ a => 5755
 hebdate(30, "Adar A", 1991-02-16, 5755) => 1992-03-05
 trigger(1992-03-05) => "5 March 1992"
 Leaving UserFN _i() => "5 March 1992"
-../tests/test.rem(49): Trig = Thursday, 5 March, 1992
+../tests/test.rem(58): Trig = Thursday, 5 March, 1992
 [_i(30, "Adar A", today(), 5756)] MSG Illegal
 today() => 1991-02-16
 Entering UserFN _i(30, "Adar A", 1991-02-16, 5756)
@@ -257,7 +322,7 @@ x => 30
 y => "Adar A"
 z => 1991-02-16
 a => 5756
-hebdate(30, "Adar A", 1991-02-16, 5756) => ../tests/test.rem(50): No Adar A in 5756
+hebdate(30, "Adar A", 1991-02-16, 5756) => ../tests/test.rem(59): No Adar A in 5756
 Invalid Hebrew date
 Leaving UserFN _i() => Invalid Hebrew date
 [_i(29, "Adar A", today(), 5755)] MSG Leap
@@ -270,7 +335,7 @@ a => 5755
 hebdate(29, "Adar A", 1991-02-16, 5755) => 1991-03-15
 trigger(1991-03-15) => "15 March 1991"
 Leaving UserFN _i() => "15 March 1991"
-../tests/test.rem(51): Trig = Friday, 15 March, 1991
+../tests/test.rem(60): Trig = Friday, 15 March, 1991
 [_i(29, "Adar A", today(), 5756)] MSG Illegal
 today() => 1991-02-16
 Entering UserFN _i(29, "Adar A", 1991-02-16, 5756)
@@ -278,238 +343,238 @@ x => 29
 y => "Adar A"
 z => 1991-02-16
 a => 5756
-hebdate(29, "Adar A", 1991-02-16, 5756) => ../tests/test.rem(52): No Adar A in 5756
+hebdate(29, "Adar A", 1991-02-16, 5756) => ../tests/test.rem(61): No Adar A in 5756
 Invalid Hebrew date
 Leaving UserFN _i() => Invalid Hebrew date
 
 # This causes a parse error on version 03.01.01
 REM 1990-01-01 SATISFY 1
-../tests/test.rem(55): Expired
+../tests/test.rem(64): Expired
 
 # Test each possible case of the basic reminders.
 
 REM MSG Every Day
-../tests/test.rem(59): Trig = Saturday, 16 February, 1991
+../tests/test.rem(68): Trig = Saturday, 16 February, 1991
 Every Day
 
 
 REM 18 MSG Every 18th 
-../tests/test.rem(61): Trig = Monday, 18 February, 1991
+../tests/test.rem(70): Trig = Monday, 18 February, 1991
 REM 15 MSG Every 15th
-../tests/test.rem(62): Trig = Friday, 15 March, 1991
+../tests/test.rem(71): Trig = Friday, 15 March, 1991
 
 REM Feb MSG February
-../tests/test.rem(64): Trig = Saturday, 16 February, 1991
+../tests/test.rem(73): Trig = Saturday, 16 February, 1991
 February
 
 REM Jan MSG January
-../tests/test.rem(65): Trig = Wednesday, 1 January, 1992
+../tests/test.rem(74): Trig = Wednesday, 1 January, 1992
 REM March MSG March
-../tests/test.rem(66): Trig = Friday, 1 March, 1991
+../tests/test.rem(75): Trig = Friday, 1 March, 1991
 
 REM 13 Jan MSG 13 Jan
-../tests/test.rem(68): Trig = Monday, 13 January, 1992
+../tests/test.rem(77): Trig = Monday, 13 January, 1992
 REM 15 Feb MSG 15 Feb
-../tests/test.rem(69): Trig = Saturday, 15 February, 1992
+../tests/test.rem(78): Trig = Saturday, 15 February, 1992
 REM 28 Feb MSG 28 Feb
-../tests/test.rem(70): Trig = Thursday, 28 February, 1991
+../tests/test.rem(79): Trig = Thursday, 28 February, 1991
 REM 29 Feb MSG 29 Feb
-../tests/test.rem(71): Trig = Saturday, 29 February, 1992
+../tests/test.rem(80): Trig = Saturday, 29 February, 1992
 REM 5 Mar MSG 5 Mar
-../tests/test.rem(72): Trig = Tuesday, 5 March, 1991
+../tests/test.rem(81): Trig = Tuesday, 5 March, 1991
 
 REM 1990 MSG 1990
-../tests/test.rem(74): Expired
+../tests/test.rem(83): Expired
 REM 1991 MSG 1991
-../tests/test.rem(75): Trig = Saturday, 16 February, 1991
+../tests/test.rem(84): Trig = Saturday, 16 February, 1991
 1991
 
 REM 1992 MSG 1991
-../tests/test.rem(76): Trig = Wednesday, 1 January, 1992
+../tests/test.rem(85): Trig = Wednesday, 1 January, 1992
 
 REM 1 1990 MSG 1 1990
-../tests/test.rem(78): Expired
+../tests/test.rem(87): Expired
 REM 29 1991 MSG 29 1991
-../tests/test.rem(79): Trig = Friday, 29 March, 1991
+../tests/test.rem(88): Trig = Friday, 29 March, 1991
 REM 29 1992 MSG 29 1992
-../tests/test.rem(80): Trig = Wednesday, 29 January, 1992
+../tests/test.rem(89): Trig = Wednesday, 29 January, 1992
 REM 16 1991 MSG 16 1991
-../tests/test.rem(81): Trig = Saturday, 16 February, 1991
+../tests/test.rem(90): Trig = Saturday, 16 February, 1991
 16 1991
 
 
 REM Jan 1990 MSG Jan 1990
-../tests/test.rem(83): Expired
+../tests/test.rem(92): Expired
 REM Feb 1991 MSG Feb 1991
-../tests/test.rem(84): Trig = Saturday, 16 February, 1991
+../tests/test.rem(93): Trig = Saturday, 16 February, 1991
 Feb 1991
 
 REM Dec 1991 MSG Dec 1991
-../tests/test.rem(85): Trig = Sunday, 1 December, 1991
+../tests/test.rem(94): Trig = Sunday, 1 December, 1991
 REM May 1992 MSG May 1992
-../tests/test.rem(86): Trig = Friday, 1 May, 1992
+../tests/test.rem(95): Trig = Friday, 1 May, 1992
 
 REM 1 Jan 1991 MSG 1 Jan 1991
-../tests/test.rem(88): Expired
+../tests/test.rem(97): Expired
 REM 16 Feb 1991 MSG 16 Feb 1991
-../tests/test.rem(89): Trig = Saturday, 16 February, 1991
+../tests/test.rem(98): Trig = Saturday, 16 February, 1991
 16 Feb 1991
 
 REM 29 Dec 1992 MSG 29 Dec 1992
-../tests/test.rem(90): Trig = Tuesday, 29 December, 1992
+../tests/test.rem(99): Trig = Tuesday, 29 December, 1992
 
 REM Sun MSG Sun
-../tests/test.rem(92): Trig = Sunday, 17 February, 1991
+../tests/test.rem(101): Trig = Sunday, 17 February, 1991
 REM Fri Sat Tue MSG Fri Sat Tue
-../tests/test.rem(93): Trig = Saturday, 16 February, 1991
+../tests/test.rem(102): Trig = Saturday, 16 February, 1991
 Fri Sat Tue
 
 
 REM Sun 16 MSG Sun 16
-../tests/test.rem(95): Trig = Sunday, 17 February, 1991
+../tests/test.rem(104): Trig = Sunday, 17 February, 1991
 REM Mon Tue Wed Thu Fri 1 MSG Mon Tue Wed Thu Fri 1
-../tests/test.rem(96): Trig = Friday, 1 March, 1991
+../tests/test.rem(105): Trig = Friday, 1 March, 1991
 
 REM Sun Feb MSG Sun Feb
-../tests/test.rem(98): Trig = Sunday, 17 February, 1991
+../tests/test.rem(107): Trig = Sunday, 17 February, 1991
 REM Mon Tue March MSG Mon Tue March
-../tests/test.rem(99): Trig = Monday, 4 March, 1991
+../tests/test.rem(108): Trig = Monday, 4 March, 1991
 
 REM Sun 16 Feb MSG Sun 16 Feb
-../tests/test.rem(101): Trig = Sunday, 17 February, 1991
+../tests/test.rem(110): Trig = Sunday, 17 February, 1991
 REM Mon Tue 10 March MSG Mon Tue 10 March
-../tests/test.rem(102): Trig = Monday, 11 March, 1991
+../tests/test.rem(111): Trig = Monday, 11 March, 1991
 
 REM Sat Sun 1991 MSG Sat Sun 1991
-../tests/test.rem(104): Trig = Saturday, 16 February, 1991
+../tests/test.rem(113): Trig = Saturday, 16 February, 1991
 Sat Sun 1991
 
 REM Mon Tue 1992 MSG Mon Tue 1992
-../tests/test.rem(105): Trig = Monday, 6 January, 1992
+../tests/test.rem(114): Trig = Monday, 6 January, 1992
 
 REM Sun 16 1991 MSG Sun 16 1991
-../tests/test.rem(107): Trig = Sunday, 17 February, 1991
+../tests/test.rem(116): Trig = Sunday, 17 February, 1991
 REM Mon Tue Wed Thu Fri 1 1992 MSG Mon Tue Wed Thu Fri 1 1992
-../tests/test.rem(108): Trig = Wednesday, 1 January, 1992
+../tests/test.rem(117): Trig = Wednesday, 1 January, 1992
 
 REM Mon Feb 1991 MSG Mon Feb 1991
-../tests/test.rem(110): Trig = Monday, 18 February, 1991
+../tests/test.rem(119): Trig = Monday, 18 February, 1991
 REM Tue Jan 1992 MSG Tue Jan 1992
-../tests/test.rem(111): Trig = Tuesday, 7 January, 1992
+../tests/test.rem(120): Trig = Tuesday, 7 January, 1992
 
 REM Sun Mon 16 Feb 1991 MSG Sun Mon 16 Feb 1991
-../tests/test.rem(113): Trig = Sunday, 17 February, 1991
+../tests/test.rem(122): Trig = Sunday, 17 February, 1991
 REM Tue 28 Jan 1992 MSG Tue 28 Jan 1992
-../tests/test.rem(114): Trig = Tuesday, 28 January, 1992
+../tests/test.rem(123): Trig = Tuesday, 28 January, 1992
 
 # Try some Backs
 CLEAR-OMIT-CONTEXT
 REM 1 -1 OMIT sat sun MSG 1 -1 OMIT Sat Sun
-../tests/test.rem(118): Trig = Thursday, 28 February, 1991
+../tests/test.rem(127): Trig = Thursday, 28 February, 1991
 REM 1 --1 OMIT sat sun MSG 1 --1 OMIT Sat Sun
-../tests/test.rem(119): Trig = Thursday, 28 February, 1991
+../tests/test.rem(128): Trig = Thursday, 28 February, 1991
 
 OMIT 28 Feb
 REM 1 -1 OMIT sat sun MSG 1 -1 OMIT Sat Sun (28 Feb omitted)
-../tests/test.rem(122): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(131): Trig = Wednesday, 27 February, 1991
 REM 1 --1 OMIT sat sun MSG 1 --1 OMIT Sat Sun (28 Feb omitted)
-../tests/test.rem(123): Trig = Thursday, 28 February, 1991
+../tests/test.rem(132): Trig = Thursday, 28 February, 1991
 
 CLEAR-OMIT-CONTEXT
 
 # Try out UNTIL
 REM Wed UNTIL 21 Feb 1991 MSG Wed UNTIL 21 Feb 1991
-../tests/test.rem(128): Trig = Wednesday, 20 February, 1991
+../tests/test.rem(137): Trig = Wednesday, 20 February, 1991
 
 # Try playing with the OMIT context
 
 OMIT 28 Feb 1991
 REM 1 Mar -1 MSG 1 mar -1 (28feb91 omitted)
-../tests/test.rem(133): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(142): Trig = Wednesday, 27 February, 1991
 REM 1 Mar --1 MSG 1 mar --1 (28Feb91 omitted)
-../tests/test.rem(134): Trig = Thursday, 28 February, 1991
+../tests/test.rem(143): Trig = Thursday, 28 February, 1991
 REM 28 Feb BEFORE MSG 28 Feb BEFORE (28Feb91 omitted)
-../tests/test.rem(135): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(144): Trig = Wednesday, 27 February, 1991
 REM 28 Feb SKIP MSG 28 Feb SKIP (28Feb91 omitted)
-../tests/test.rem(136): Trig = Friday, 28 February, 1992
+../tests/test.rem(145): Trig = Friday, 28 February, 1992
 REM 28 Feb AFTER MSG 28 Feb AFTER (28Feb91 omitted)
-../tests/test.rem(137): Trig = Friday, 1 March, 1991
+../tests/test.rem(146): Trig = Friday, 1 March, 1991
 
 PUSH-OMIT-CONTEXT
 CLEAR-OMIT-CONTEXT
 REM 1 Mar -1 MSG 1 mar -1
-../tests/test.rem(141): Trig = Thursday, 28 February, 1991
+../tests/test.rem(150): Trig = Thursday, 28 February, 1991
 REM 1 Mar --1 MSG 1 mar --1
-../tests/test.rem(142): Trig = Thursday, 28 February, 1991
+../tests/test.rem(151): Trig = Thursday, 28 February, 1991
 REM 28 Feb BEFORE MSG 28 Feb BEFORE
-../tests/test.rem(143): Trig = Thursday, 28 February, 1991
+../tests/test.rem(152): Trig = Thursday, 28 February, 1991
 REM 28 Feb SKIP MSG 28 Feb SKIP
-../tests/test.rem(144): Trig = Thursday, 28 February, 1991
+../tests/test.rem(153): Trig = Thursday, 28 February, 1991
 REM 28 Feb AFTER MSG 28 Feb AFTER
-../tests/test.rem(145): Trig = Thursday, 28 February, 1991
+../tests/test.rem(154): Trig = Thursday, 28 February, 1991
 
 POP-OMIT-CONTEXT
 REM 1 Mar -1 MSG 1 mar -1 (28feb91 omitted)
-../tests/test.rem(148): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(157): Trig = Wednesday, 27 February, 1991
 REM 1 Mar --1 MSG 1 mar --1 (28Feb91 omitted)
-../tests/test.rem(149): Trig = Thursday, 28 February, 1991
+../tests/test.rem(158): Trig = Thursday, 28 February, 1991
 REM 28 Feb BEFORE MSG 28 Feb BEFORE (28Feb91 omitted)
-../tests/test.rem(150): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(159): Trig = Wednesday, 27 February, 1991
 REM 28 Feb SKIP MSG 28 Feb SKIP (28Feb91 omitted)
-../tests/test.rem(151): Trig = Friday, 28 February, 1992
+../tests/test.rem(160): Trig = Friday, 28 February, 1992
 REM 28 Feb AFTER MSG 28 Feb AFTER (28Feb91 omitted)
-../tests/test.rem(152): Trig = Friday, 1 March, 1991
+../tests/test.rem(161): Trig = Friday, 1 March, 1991
 
 
 REM 13 March 1991 *1 UNTIL 19 March 1991 MSG 13-19 Mar 91
-../tests/test.rem(155): Trig = Wednesday, 13 March, 1991
+../tests/test.rem(164): Trig = Wednesday, 13 March, 1991
 
 # Test BACK
 CLEAR-OMIT-CONTEXT
 REM 18 Feb 1991 +1 MSG 18 Feb 1991 +1
-../tests/test.rem(159): Trig = Monday, 18 February, 1991
+../tests/test.rem(168): Trig = Monday, 18 February, 1991
 
 OMIT 17 Feb 1991
 REM 18 Feb 1991 +1 MSG 18 Feb 1991 +1 (17Feb91 omitted)
-../tests/test.rem(162): Trig = Monday, 18 February, 1991
+../tests/test.rem(171): Trig = Monday, 18 February, 1991
 18 Feb 1991 +1 (17Feb91 omitted)
 
 REM 18 Feb 1991 ++1 MSG 18 Feb 1991 ++1 (17Feb91 omitted)
-../tests/test.rem(163): Trig = Monday, 18 February, 1991
+../tests/test.rem(172): Trig = Monday, 18 February, 1991
 
 CLEAR-OMIT-CONTEXT
 # Test the scanfrom clause
 REM Fri SATISFY 1
-../tests/test.rem(167): Trig = Friday, 22 February, 1991
-../tests/test.rem(167): Trig(satisfied) = Friday, 22 February, 1991
+../tests/test.rem(176): Trig = Friday, 22 February, 1991
+../tests/test.rem(176): Trig(satisfied) = Friday, 22 February, 1991
 OMIT [trigger(trigdate())]
 trigdate() => 1991-02-22
 trigger(1991-02-22) => "22 February 1991"
 REM Fri after MSG 23 Feb 1991
-../tests/test.rem(169): Trig = Saturday, 23 February, 1991
+../tests/test.rem(178): Trig = Saturday, 23 February, 1991
 CLEAR-OMIT-CONTEXT
 REM Fri SCANFROM [trigger(today()-7)] SATISFY 1
 today() => 1991-02-16
 1991-02-16 - 7 => 1991-02-09
 trigger(1991-02-09) => "9 February 1991"
-../tests/test.rem(171): Trig = Friday, 15 February, 1991
-../tests/test.rem(171): Trig(satisfied) = Friday, 15 February, 1991
+../tests/test.rem(180): Trig = Friday, 15 February, 1991
+../tests/test.rem(180): Trig(satisfied) = Friday, 15 February, 1991
 OMIT [trigger(trigdate())]
 trigdate() => 1991-02-15
 trigger(1991-02-15) => "15 February 1991"
 REM Fri after MSG 16 Feb 1991
-../tests/test.rem(173): Trig = Saturday, 16 February, 1991
+../tests/test.rem(182): Trig = Saturday, 16 February, 1991
 16 Feb 1991
 
 CLEAR-OMIT-CONTEXT
 REM Fri SCANFROM -7 SATISFY 1
-../tests/test.rem(175): Trig = Friday, 15 February, 1991
-../tests/test.rem(175): Trig(satisfied) = Friday, 15 February, 1991
+../tests/test.rem(184): Trig = Friday, 15 February, 1991
+../tests/test.rem(184): Trig(satisfied) = Friday, 15 February, 1991
 OMIT [trigger(trigdate())]
 trigdate() => 1991-02-15
 trigger(1991-02-15) => "15 February 1991"
 REM Fri after MSG 16 Feb 1991
-../tests/test.rem(177): Trig = Saturday, 16 February, 1991
+../tests/test.rem(186): Trig = Saturday, 16 February, 1991
 16 Feb 1991
 
 CLEAR-OMIT-CONTEXT
@@ -607,7 +672,7 @@ day(1991-03-08) => 8
 8 % 2 => 0
 0 || 0 => 0
 Leaving UserFN _ofunc() => 0
-../tests/test.rem(182): Trig = Friday, 8 March, 1991
+../tests/test.rem(191): Trig = Friday, 8 March, 1991
 REM 8 March OMITFUNC _ofunc -1 MSG OmitFunc Test 2
 Entering UserFN _ofunc(1991-03-07)
 x => 1991-03-07
@@ -681,31 +746,31 @@ day(1991-02-28) => 28
 28 % 2 => 0
 0 || 0 => 0
 Leaving UserFN _ofunc() => 0
-../tests/test.rem(183): Trig = Thursday, 28 February, 1991
+../tests/test.rem(192): Trig = Thursday, 28 February, 1991
 
 # omitfunc ignores local/global omits
 fset _ofunc(x) 0
 OMIT 1 March
 OMIT 2 March 1991
 REM 1 March OMIT Sun OMITFUNC _ofunc AFTER MSG Should trigger 1 March
-../tests/test.rem(189): Warning: OMIT is ignored if you use OMITFUNC
+../tests/test.rem(198): Warning: OMIT is ignored if you use OMITFUNC
 Entering UserFN _ofunc(1991-02-15)
 Leaving UserFN _ofunc() => 0
 Entering UserFN _ofunc(1991-03-01)
 Leaving UserFN _ofunc() => 0
-../tests/test.rem(189): Trig = Friday, 1 March, 1991
+../tests/test.rem(198): Trig = Friday, 1 March, 1991
 REM 1 March OMIT Sun AFTER MSG Should trigger 4 March
-../tests/test.rem(190): Trig = Monday, 4 March, 1991
+../tests/test.rem(199): Trig = Monday, 4 March, 1991
 
 # Test shorthand reminders
 REM 1991-02-28 MSG Feb 28
-../tests/test.rem(193): Trig = Thursday, 28 February, 1991
+../tests/test.rem(202): Trig = Thursday, 28 February, 1991
 REM 1991/02/28@14:45 MSG Feb 28
-../tests/test.rem(194): Trig = Thursday, 28 February, 1991 AT 14:45
+../tests/test.rem(203): Trig = Thursday, 28 February, 1991 AT 14:45
 REM Wed UNTIL 1991-01-01 MSG Expired
-../tests/test.rem(195): Expired
+../tests/test.rem(204): Expired
 REM Wed SCANFROM 1991-02-26 MSG SCANFROM
-../tests/test.rem(196): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(205): Trig = Wednesday, 27 February, 1991
 
 set a000 abs(1)
 abs(1) => 1
@@ -729,7 +794,7 @@ set a008 coerce("string", 11:44)
 coerce("string", 11:44) => "11:44"
 set a009 coerce("int", "badnews")
 coerce("int", "badnews") => Can't coerce
-../tests/test.rem(207): Can't coerce
+../tests/test.rem(216): Can't coerce
 set a010 coerce("int", "12")
 coerce("int", "12") => 12
 set a011 coerce("int", 11:44)
@@ -741,7 +806,7 @@ set a013 date(1992, 2, 2)
 date(1992, 2, 2) => 1992-02-02
 set a014 date(1993, 2, 29)
 date(1993, 2, 29) => Bad date specification
-../tests/test.rem(212): Bad date specification
+../tests/test.rem(221): Bad date specification
 set a015 day(today())
 today() => 1991-02-16
 day(1991-02-16) => 16
@@ -836,15 +901,15 @@ strlen("sadjflkhsldkfhsdlfjhk") => 21
 set a050 substr(a049, 2)
 a049 => 21
 substr(21, 2) => Type mismatch
-../tests/test.rem(250): Type mismatch
+../tests/test.rem(259): Type mismatch
 set a051 substr(a050, 2, 6)
-a050 => ../tests/test.rem(251): Undefined variable: a050
+a050 => ../tests/test.rem(260): Undefined variable: a050
 set a052 time(1+2, 3+4)
 1 + 2 => 3
 3 + 4 => 7
 time(3, 7) => 03:07
 rem 10 jan 1992 AT 11:22 CAL
-../tests/test.rem(253): Trig = Friday, 10 January, 1992 AT 11:22
+../tests/test.rem(262): Trig = Friday, 10 January, 1992 AT 11:22
 set a053 trigdate()
 trigdate() => 1992-01-10
 set a054 trigtime()
@@ -936,101 +1001,101 @@ y => 11:33
 x => "foo"
 y => 11:33
 "foo" * 11:33 => Type mismatch
-../tests/test.rem(276): `*': Type mismatch
+../tests/test.rem(285): `*': Type mismatch
 Leaving UserFN h() => Type mismatch
 set a074 dosubst("%a %b %c %d %e %f %g %h", '1992/5/5')
 dosubst("%a %b %c %d %e %f %g %h", 1992-05-05) => "on Tuesday, 5 May, 1992 in 444 days' tim"...
 msg [a074]%
-../tests/test.rem(278): Trig = Saturday, 16 February, 1991
+../tests/test.rem(287): Trig = Saturday, 16 February, 1991
 a074 => "on Tuesday, 5 May, 1992 in 444 days' tim"...
 on Tuesday, 5 May, 1992 in 444 days' time on Tuesday 5 on 05-05-1992 on 05-05-1992 on Tuesday, 5 May on 05-05
 set a075 dosubst("%i %j %k %l %m %n %o %p", '1992/5/5')
 dosubst("%i %j %k %l %m %n %o %p", 1992-05-05) => "on 05-05 on Tuesday, May 5th, 1992 on Tu"...
 msg [a075]%
-../tests/test.rem(280): Trig = Saturday, 16 February, 1991
+../tests/test.rem(289): Trig = Saturday, 16 February, 1991
 a075 => "on 05-05 on Tuesday, May 5th, 1992 on Tu"...
 on 05-05 on Tuesday, May 5th, 1992 on Tuesday, May 5th on 1992-05-05 May 5  s
 set a076 dosubst("%q %r %s %t %u %v %w %x", '1992/5/5')
 dosubst("%q %r %s %t %u %v %w %x", 1992-05-05) => "s' 05 th 05 on Tuesday, 5th May, 1992 on"...
 msg [a076]%
-../tests/test.rem(282): Trig = Saturday, 16 February, 1991
+../tests/test.rem(291): Trig = Saturday, 16 February, 1991
 a076 => "s' 05 th 05 on Tuesday, 5th May, 1992 on"...
 s' 05 th 05 on Tuesday, 5th May, 1992 on Tuesday, 5th May Tuesday 444
 set a074 dosubst("%*a %*b %*c %*d %*e %*f %*g %*h", '1992/5/5')
 dosubst("%*a %*b %*c %*d %*e %*f %*g %*h", 1992-05-05) => "Tuesday, 5 May, 1992 in 444 days' time T"...
 msg [a074]%
-../tests/test.rem(284): Trig = Saturday, 16 February, 1991
+../tests/test.rem(293): Trig = Saturday, 16 February, 1991
 a074 => "Tuesday, 5 May, 1992 in 444 days' time T"...
 Tuesday, 5 May, 1992 in 444 days' time Tuesday 5 05-05-1992 05-05-1992 Tuesday, 5 May 05-05
 set a075 dosubst("%*i %*j %*k %*l %*m %*n %*o %*p", '1992/5/5')
 dosubst("%*i %*j %*k %*l %*m %*n %*o %*p", 1992-05-05) => "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
 msg [a075]%
-../tests/test.rem(286): Trig = Saturday, 16 February, 1991
+../tests/test.rem(295): Trig = Saturday, 16 February, 1991
 a075 => "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
 05-05 Tuesday, May 5th, 1992 Tuesday, May 5th 1992-05-05 May 5  s
 set a076 dosubst("%*q %*r %*s %*t %*u %*v %*w %*x", '1992/5/5')
 dosubst("%*q %*r %*s %*t %*u %*v %*w %*x", 1992-05-05) => "s' 05 th 05 Tuesday, 5th May, 1992 Tuesd"...
 msg [a076]%
-../tests/test.rem(288): Trig = Saturday, 16 February, 1991
+../tests/test.rem(297): Trig = Saturday, 16 February, 1991
 a076 => "s' 05 th 05 Tuesday, 5th May, 1992 Tuesd"...
 s' 05 th 05 Tuesday, 5th May, 1992 Tuesday, 5th May Tuesday 444
 set a077 dosubst("%*y %*z", '1992/5/5')
 dosubst("%*y %*z", 1992-05-05) => "1992 92
 "
 msg [a077]%
-../tests/test.rem(290): Trig = Saturday, 16 February, 1991
+../tests/test.rem(299): Trig = Saturday, 16 February, 1991
 a077 => "1992 92
 "
 1992 92
 set a074 dosubst("%A %B %C %D %E %F %G %H", '1992/5/5')
 dosubst("%A %B %C %D %E %F %G %H", 1992-05-05) => "On Tuesday, 5 May, 1992 In 444 days' tim"...
 msg [a074]%
-../tests/test.rem(292): Trig = Saturday, 16 February, 1991
+../tests/test.rem(301): Trig = Saturday, 16 February, 1991
 a074 => "On Tuesday, 5 May, 1992 In 444 days' tim"...
 On Tuesday, 5 May, 1992 In 444 days' time On Tuesday 5 On 05-05-1992 On 05-05-1992 On Tuesday, 5 May On 05-05
 set a075 dosubst("%I %J %K %L %M %N %O %P", '1992/5/5')
 dosubst("%I %J %K %L %M %N %O %P", 1992-05-05) => "On 05-05 On Tuesday, May 5th, 1992 On Tu"...
 msg [a075]%
-../tests/test.rem(294): Trig = Saturday, 16 February, 1991
+../tests/test.rem(303): Trig = Saturday, 16 February, 1991
 a075 => "On 05-05 On Tuesday, May 5th, 1992 On Tu"...
 On 05-05 On Tuesday, May 5th, 1992 On Tuesday, May 5th On 1992-05-05 May 5  S
 set a076 dosubst("%Q %R %S %T %U %V %W %X", '1992/5/5')
 dosubst("%Q %R %S %T %U %V %W %X", 1992-05-05) => "S' 05 Th 05 On Tuesday, 5th May, 1992 On"...
 msg [a076]%
-../tests/test.rem(296): Trig = Saturday, 16 February, 1991
+../tests/test.rem(305): Trig = Saturday, 16 February, 1991
 a076 => "S' 05 Th 05 On Tuesday, 5th May, 1992 On"...
 S' 05 Th 05 On Tuesday, 5th May, 1992 On Tuesday, 5th May Tuesday 444
 set a077 dosubst("%Y %Z", '1992/5/5')
 dosubst("%Y %Z", 1992-05-05) => "1992 92
 "
 msg [a077]%
-../tests/test.rem(298): Trig = Saturday, 16 February, 1991
+../tests/test.rem(307): Trig = Saturday, 16 February, 1991
 a077 => "1992 92
 "
 1992 92
 set a074 dosubst("%*A %*B %*C %*D %*E %*F %*G %*H", '1992/5/5')
 dosubst("%*A %*B %*C %*D %*E %*F %*G %*H", 1992-05-05) => "Tuesday, 5 May, 1992 In 444 days' time T"...
 msg [a074]%
-../tests/test.rem(300): Trig = Saturday, 16 February, 1991
+../tests/test.rem(309): Trig = Saturday, 16 February, 1991
 a074 => "Tuesday, 5 May, 1992 In 444 days' time T"...
 Tuesday, 5 May, 1992 In 444 days' time Tuesday 5 05-05-1992 05-05-1992 Tuesday, 5 May 05-05
 set a075 dosubst("%*I %*J %*K %*L %*M %*N %*O %*P", '1992/5/5')
 dosubst("%*I %*J %*K %*L %*M %*N %*O %*P", 1992-05-05) => "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
 msg [a075]%
-../tests/test.rem(302): Trig = Saturday, 16 February, 1991
+../tests/test.rem(311): Trig = Saturday, 16 February, 1991
 a075 => "05-05 Tuesday, May 5th, 1992 Tuesday, Ma"...
 05-05 Tuesday, May 5th, 1992 Tuesday, May 5th 1992-05-05 May 5  S
 set a076 dosubst("%*Q %*R %*S %*T %*U %*V %*W %*X", '1992/5/5')
 dosubst("%*Q %*R %*S %*T %*U %*V %*W %*X", 1992-05-05) => "S' 05 Th 05 Tuesday, 5th May, 1992 Tuesd"...
 msg [a076]%
-../tests/test.rem(304): Trig = Saturday, 16 February, 1991
+../tests/test.rem(313): Trig = Saturday, 16 February, 1991
 a076 => "S' 05 Th 05 Tuesday, 5th May, 1992 Tuesd"...
 S' 05 Th 05 Tuesday, 5th May, 1992 Tuesday, 5th May Tuesday 444
 set a077 dosubst("%*Y %*Z", '1992/5/5')
 dosubst("%*Y %*Z", 1992-05-05) => "1992 92
 "
 msg [a077]%
-../tests/test.rem(306): Trig = Saturday, 16 February, 1991
+../tests/test.rem(315): Trig = Saturday, 16 February, 1991
 a077 => "1992 92
 "
 1992 92
@@ -1053,7 +1118,7 @@ nonomitted(1991-03-01, 1991-03-13, "Sat", "Sun") => 7
 set a085 nonomitted('1991-03-24', '1991-04-01', "Sat")
 nonomitted(1991-03-24, 1991-04-01, "Sat") => 7
 REM 2010-09-03 +3 -4 UNTIL 2012-01-01 PRIORITY 7 *14 MSG foo
-../tests/test.rem(316): Trig = Monday, 30 August, 2010
+../tests/test.rem(325): Trig = Monday, 30 August, 2010
 set a086 trigback()
 trigback() => 4
 set a087 trigdelta()
@@ -1076,7 +1141,7 @@ set a095 trigduration()
 trigduration() => -1
 
 REM Mon Wed FROM 2010-09-03 ++3 --4 MSG foo
-../tests/test.rem(328): Trig = Saturday, 4 September, 2010
+../tests/test.rem(337): Trig = Saturday, 4 September, 2010
 set a096 trigback()
 trigback() => -4
 set a097 trigdelta()
@@ -1099,7 +1164,7 @@ set a105 trigduration()
 trigduration() => -1
 
 REM 2010-09-03 +3 -4 UNTIL 2012-01-01 PRIORITY 7 *14 AT 14:41 +15 *2 DURATION 213 MSG foo
-../tests/test.rem(340): Trig = Monday, 30 August, 2010 AT 14:41 DURATION 03:33
+../tests/test.rem(349): Trig = Monday, 30 August, 2010 AT 14:41 DURATION 03:33
 set a106 trigback()
 trigback() => 4
 set a107 trigdelta()
@@ -1122,7 +1187,7 @@ set a115 trigduration()
 trigduration() => 03:33
 
 REM Mon Wed FROM 2010-09-03 ++3 --4 AT 14:44 MSG foo
-../tests/test.rem(352): Trig = Saturday, 4 September, 2010 AT 14:44
+../tests/test.rem(361): Trig = Saturday, 4 September, 2010 AT 14:44
 set a116 trigback()
 trigback() => -4
 set a117 trigdelta()
@@ -1156,9 +1221,9 @@ set a129 23:30 + '2019-02-02@16:44'
 
 # Multi-day reminder
 REM 13 AT 16:00 DURATION 72:00 MSG 72-hour event
-../tests/test.rem(371): Trig = Wednesday, 13 March, 1991 AT 16:00 DURATION 72:00
-../tests/test.rem(371): Trig = Wednesday, 13 February, 1991 AT 16:00 DURATION 72:00
-../tests/test.rem(371): Trig(adj) = Saturday, 16 February, 1991 AT 00:00 DURATION 16:00
+../tests/test.rem(380): Trig = Wednesday, 13 March, 1991 AT 16:00 DURATION 72:00
+../tests/test.rem(380): Trig = Wednesday, 13 February, 1991 AT 16:00 DURATION 72:00
+../tests/test.rem(380): Trig(adj) = Saturday, 16 February, 1991 AT 00:00 DURATION 16:00
 72-hour event
 
 set a130 trigdate()
@@ -1176,1210 +1241,1210 @@ trigeventduration() => 72:00
 
 # These will issue errors
 REM Mon OMIT Mon SKIP MSG Never ever ever...
-../tests/test.rem(380): Can't compute trigger
+../tests/test.rem(389): Can't compute trigger
 REM Mon SATISFY [wkdaynum($T) == 3] MSG Nope nope...
-../tests/test.rem(381): Trig = Monday, 18 February, 1991
+../tests/test.rem(390): Trig = Monday, 18 February, 1991
 $T => 1991-02-18
 wkdaynum(1991-02-18) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 25 February, 1991
+../tests/test.rem(390): Trig = Monday, 25 February, 1991
 $T => 1991-02-25
 wkdaynum(1991-02-25) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 4 March, 1991
+../tests/test.rem(390): Trig = Monday, 4 March, 1991
 $T => 1991-03-04
 wkdaynum(1991-03-04) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 11 March, 1991
+../tests/test.rem(390): Trig = Monday, 11 March, 1991
 $T => 1991-03-11
 wkdaynum(1991-03-11) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 18 March, 1991
+../tests/test.rem(390): Trig = Monday, 18 March, 1991
 $T => 1991-03-18
 wkdaynum(1991-03-18) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 25 March, 1991
+../tests/test.rem(390): Trig = Monday, 25 March, 1991
 $T => 1991-03-25
 wkdaynum(1991-03-25) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 1 April, 1991
+../tests/test.rem(390): Trig = Monday, 1 April, 1991
 $T => 1991-04-01
 wkdaynum(1991-04-01) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 8 April, 1991
+../tests/test.rem(390): Trig = Monday, 8 April, 1991
 $T => 1991-04-08
 wkdaynum(1991-04-08) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 15 April, 1991
+../tests/test.rem(390): Trig = Monday, 15 April, 1991
 $T => 1991-04-15
 wkdaynum(1991-04-15) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 22 April, 1991
+../tests/test.rem(390): Trig = Monday, 22 April, 1991
 $T => 1991-04-22
 wkdaynum(1991-04-22) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 29 April, 1991
+../tests/test.rem(390): Trig = Monday, 29 April, 1991
 $T => 1991-04-29
 wkdaynum(1991-04-29) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 6 May, 1991
+../tests/test.rem(390): Trig = Monday, 6 May, 1991
 $T => 1991-05-06
 wkdaynum(1991-05-06) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 13 May, 1991
+../tests/test.rem(390): Trig = Monday, 13 May, 1991
 $T => 1991-05-13
 wkdaynum(1991-05-13) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 20 May, 1991
+../tests/test.rem(390): Trig = Monday, 20 May, 1991
 $T => 1991-05-20
 wkdaynum(1991-05-20) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 27 May, 1991
+../tests/test.rem(390): Trig = Monday, 27 May, 1991
 $T => 1991-05-27
 wkdaynum(1991-05-27) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 3 June, 1991
+../tests/test.rem(390): Trig = Monday, 3 June, 1991
 $T => 1991-06-03
 wkdaynum(1991-06-03) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 10 June, 1991
+../tests/test.rem(390): Trig = Monday, 10 June, 1991
 $T => 1991-06-10
 wkdaynum(1991-06-10) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 17 June, 1991
+../tests/test.rem(390): Trig = Monday, 17 June, 1991
 $T => 1991-06-17
 wkdaynum(1991-06-17) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 24 June, 1991
+../tests/test.rem(390): Trig = Monday, 24 June, 1991
 $T => 1991-06-24
 wkdaynum(1991-06-24) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 1 July, 1991
+../tests/test.rem(390): Trig = Monday, 1 July, 1991
 $T => 1991-07-01
 wkdaynum(1991-07-01) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 8 July, 1991
+../tests/test.rem(390): Trig = Monday, 8 July, 1991
 $T => 1991-07-08
 wkdaynum(1991-07-08) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 15 July, 1991
+../tests/test.rem(390): Trig = Monday, 15 July, 1991
 $T => 1991-07-15
 wkdaynum(1991-07-15) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 22 July, 1991
+../tests/test.rem(390): Trig = Monday, 22 July, 1991
 $T => 1991-07-22
 wkdaynum(1991-07-22) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 29 July, 1991
+../tests/test.rem(390): Trig = Monday, 29 July, 1991
 $T => 1991-07-29
 wkdaynum(1991-07-29) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 5 August, 1991
+../tests/test.rem(390): Trig = Monday, 5 August, 1991
 $T => 1991-08-05
 wkdaynum(1991-08-05) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 12 August, 1991
+../tests/test.rem(390): Trig = Monday, 12 August, 1991
 $T => 1991-08-12
 wkdaynum(1991-08-12) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 19 August, 1991
+../tests/test.rem(390): Trig = Monday, 19 August, 1991
 $T => 1991-08-19
 wkdaynum(1991-08-19) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 26 August, 1991
+../tests/test.rem(390): Trig = Monday, 26 August, 1991
 $T => 1991-08-26
 wkdaynum(1991-08-26) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 2 September, 1991
+../tests/test.rem(390): Trig = Monday, 2 September, 1991
 $T => 1991-09-02
 wkdaynum(1991-09-02) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 9 September, 1991
+../tests/test.rem(390): Trig = Monday, 9 September, 1991
 $T => 1991-09-09
 wkdaynum(1991-09-09) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 16 September, 1991
+../tests/test.rem(390): Trig = Monday, 16 September, 1991
 $T => 1991-09-16
 wkdaynum(1991-09-16) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 23 September, 1991
+../tests/test.rem(390): Trig = Monday, 23 September, 1991
 $T => 1991-09-23
 wkdaynum(1991-09-23) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 30 September, 1991
+../tests/test.rem(390): Trig = Monday, 30 September, 1991
 $T => 1991-09-30
 wkdaynum(1991-09-30) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 7 October, 1991
+../tests/test.rem(390): Trig = Monday, 7 October, 1991
 $T => 1991-10-07
 wkdaynum(1991-10-07) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 14 October, 1991
+../tests/test.rem(390): Trig = Monday, 14 October, 1991
 $T => 1991-10-14
 wkdaynum(1991-10-14) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 21 October, 1991
+../tests/test.rem(390): Trig = Monday, 21 October, 1991
 $T => 1991-10-21
 wkdaynum(1991-10-21) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 28 October, 1991
+../tests/test.rem(390): Trig = Monday, 28 October, 1991
 $T => 1991-10-28
 wkdaynum(1991-10-28) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 4 November, 1991
+../tests/test.rem(390): Trig = Monday, 4 November, 1991
 $T => 1991-11-04
 wkdaynum(1991-11-04) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 11 November, 1991
+../tests/test.rem(390): Trig = Monday, 11 November, 1991
 $T => 1991-11-11
 wkdaynum(1991-11-11) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 18 November, 1991
+../tests/test.rem(390): Trig = Monday, 18 November, 1991
 $T => 1991-11-18
 wkdaynum(1991-11-18) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 25 November, 1991
+../tests/test.rem(390): Trig = Monday, 25 November, 1991
 $T => 1991-11-25
 wkdaynum(1991-11-25) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 2 December, 1991
+../tests/test.rem(390): Trig = Monday, 2 December, 1991
 $T => 1991-12-02
 wkdaynum(1991-12-02) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 9 December, 1991
+../tests/test.rem(390): Trig = Monday, 9 December, 1991
 $T => 1991-12-09
 wkdaynum(1991-12-09) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 16 December, 1991
+../tests/test.rem(390): Trig = Monday, 16 December, 1991
 $T => 1991-12-16
 wkdaynum(1991-12-16) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 23 December, 1991
+../tests/test.rem(390): Trig = Monday, 23 December, 1991
 $T => 1991-12-23
 wkdaynum(1991-12-23) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 30 December, 1991
+../tests/test.rem(390): Trig = Monday, 30 December, 1991
 $T => 1991-12-30
 wkdaynum(1991-12-30) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 6 January, 1992
+../tests/test.rem(390): Trig = Monday, 6 January, 1992
 $T => 1992-01-06
 wkdaynum(1992-01-06) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 13 January, 1992
+../tests/test.rem(390): Trig = Monday, 13 January, 1992
 $T => 1992-01-13
 wkdaynum(1992-01-13) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 20 January, 1992
+../tests/test.rem(390): Trig = Monday, 20 January, 1992
 $T => 1992-01-20
 wkdaynum(1992-01-20) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 27 January, 1992
+../tests/test.rem(390): Trig = Monday, 27 January, 1992
 $T => 1992-01-27
 wkdaynum(1992-01-27) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 3 February, 1992
+../tests/test.rem(390): Trig = Monday, 3 February, 1992
 $T => 1992-02-03
 wkdaynum(1992-02-03) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 10 February, 1992
+../tests/test.rem(390): Trig = Monday, 10 February, 1992
 $T => 1992-02-10
 wkdaynum(1992-02-10) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 17 February, 1992
+../tests/test.rem(390): Trig = Monday, 17 February, 1992
 $T => 1992-02-17
 wkdaynum(1992-02-17) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 24 February, 1992
+../tests/test.rem(390): Trig = Monday, 24 February, 1992
 $T => 1992-02-24
 wkdaynum(1992-02-24) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 2 March, 1992
+../tests/test.rem(390): Trig = Monday, 2 March, 1992
 $T => 1992-03-02
 wkdaynum(1992-03-02) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 9 March, 1992
+../tests/test.rem(390): Trig = Monday, 9 March, 1992
 $T => 1992-03-09
 wkdaynum(1992-03-09) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 16 March, 1992
+../tests/test.rem(390): Trig = Monday, 16 March, 1992
 $T => 1992-03-16
 wkdaynum(1992-03-16) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 23 March, 1992
+../tests/test.rem(390): Trig = Monday, 23 March, 1992
 $T => 1992-03-23
 wkdaynum(1992-03-23) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 30 March, 1992
+../tests/test.rem(390): Trig = Monday, 30 March, 1992
 $T => 1992-03-30
 wkdaynum(1992-03-30) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 6 April, 1992
+../tests/test.rem(390): Trig = Monday, 6 April, 1992
 $T => 1992-04-06
 wkdaynum(1992-04-06) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 13 April, 1992
+../tests/test.rem(390): Trig = Monday, 13 April, 1992
 $T => 1992-04-13
 wkdaynum(1992-04-13) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 20 April, 1992
+../tests/test.rem(390): Trig = Monday, 20 April, 1992
 $T => 1992-04-20
 wkdaynum(1992-04-20) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 27 April, 1992
+../tests/test.rem(390): Trig = Monday, 27 April, 1992
 $T => 1992-04-27
 wkdaynum(1992-04-27) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 4 May, 1992
+../tests/test.rem(390): Trig = Monday, 4 May, 1992
 $T => 1992-05-04
 wkdaynum(1992-05-04) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 11 May, 1992
+../tests/test.rem(390): Trig = Monday, 11 May, 1992
 $T => 1992-05-11
 wkdaynum(1992-05-11) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 18 May, 1992
+../tests/test.rem(390): Trig = Monday, 18 May, 1992
 $T => 1992-05-18
 wkdaynum(1992-05-18) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 25 May, 1992
+../tests/test.rem(390): Trig = Monday, 25 May, 1992
 $T => 1992-05-25
 wkdaynum(1992-05-25) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 1 June, 1992
+../tests/test.rem(390): Trig = Monday, 1 June, 1992
 $T => 1992-06-01
 wkdaynum(1992-06-01) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 8 June, 1992
+../tests/test.rem(390): Trig = Monday, 8 June, 1992
 $T => 1992-06-08
 wkdaynum(1992-06-08) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 15 June, 1992
+../tests/test.rem(390): Trig = Monday, 15 June, 1992
 $T => 1992-06-15
 wkdaynum(1992-06-15) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 22 June, 1992
+../tests/test.rem(390): Trig = Monday, 22 June, 1992
 $T => 1992-06-22
 wkdaynum(1992-06-22) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 29 June, 1992
+../tests/test.rem(390): Trig = Monday, 29 June, 1992
 $T => 1992-06-29
 wkdaynum(1992-06-29) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 6 July, 1992
+../tests/test.rem(390): Trig = Monday, 6 July, 1992
 $T => 1992-07-06
 wkdaynum(1992-07-06) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 13 July, 1992
+../tests/test.rem(390): Trig = Monday, 13 July, 1992
 $T => 1992-07-13
 wkdaynum(1992-07-13) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 20 July, 1992
+../tests/test.rem(390): Trig = Monday, 20 July, 1992
 $T => 1992-07-20
 wkdaynum(1992-07-20) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 27 July, 1992
+../tests/test.rem(390): Trig = Monday, 27 July, 1992
 $T => 1992-07-27
 wkdaynum(1992-07-27) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 3 August, 1992
+../tests/test.rem(390): Trig = Monday, 3 August, 1992
 $T => 1992-08-03
 wkdaynum(1992-08-03) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 10 August, 1992
+../tests/test.rem(390): Trig = Monday, 10 August, 1992
 $T => 1992-08-10
 wkdaynum(1992-08-10) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 17 August, 1992
+../tests/test.rem(390): Trig = Monday, 17 August, 1992
 $T => 1992-08-17
 wkdaynum(1992-08-17) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 24 August, 1992
+../tests/test.rem(390): Trig = Monday, 24 August, 1992
 $T => 1992-08-24
 wkdaynum(1992-08-24) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 31 August, 1992
+../tests/test.rem(390): Trig = Monday, 31 August, 1992
 $T => 1992-08-31
 wkdaynum(1992-08-31) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 7 September, 1992
+../tests/test.rem(390): Trig = Monday, 7 September, 1992
 $T => 1992-09-07
 wkdaynum(1992-09-07) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 14 September, 1992
+../tests/test.rem(390): Trig = Monday, 14 September, 1992
 $T => 1992-09-14
 wkdaynum(1992-09-14) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 21 September, 1992
+../tests/test.rem(390): Trig = Monday, 21 September, 1992
 $T => 1992-09-21
 wkdaynum(1992-09-21) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 28 September, 1992
+../tests/test.rem(390): Trig = Monday, 28 September, 1992
 $T => 1992-09-28
 wkdaynum(1992-09-28) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 5 October, 1992
+../tests/test.rem(390): Trig = Monday, 5 October, 1992
 $T => 1992-10-05
 wkdaynum(1992-10-05) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 12 October, 1992
+../tests/test.rem(390): Trig = Monday, 12 October, 1992
 $T => 1992-10-12
 wkdaynum(1992-10-12) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 19 October, 1992
+../tests/test.rem(390): Trig = Monday, 19 October, 1992
 $T => 1992-10-19
 wkdaynum(1992-10-19) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 26 October, 1992
+../tests/test.rem(390): Trig = Monday, 26 October, 1992
 $T => 1992-10-26
 wkdaynum(1992-10-26) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 2 November, 1992
+../tests/test.rem(390): Trig = Monday, 2 November, 1992
 $T => 1992-11-02
 wkdaynum(1992-11-02) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 9 November, 1992
+../tests/test.rem(390): Trig = Monday, 9 November, 1992
 $T => 1992-11-09
 wkdaynum(1992-11-09) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 16 November, 1992
+../tests/test.rem(390): Trig = Monday, 16 November, 1992
 $T => 1992-11-16
 wkdaynum(1992-11-16) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 23 November, 1992
+../tests/test.rem(390): Trig = Monday, 23 November, 1992
 $T => 1992-11-23
 wkdaynum(1992-11-23) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 30 November, 1992
+../tests/test.rem(390): Trig = Monday, 30 November, 1992
 $T => 1992-11-30
 wkdaynum(1992-11-30) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 7 December, 1992
+../tests/test.rem(390): Trig = Monday, 7 December, 1992
 $T => 1992-12-07
 wkdaynum(1992-12-07) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 14 December, 1992
+../tests/test.rem(390): Trig = Monday, 14 December, 1992
 $T => 1992-12-14
 wkdaynum(1992-12-14) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 21 December, 1992
+../tests/test.rem(390): Trig = Monday, 21 December, 1992
 $T => 1992-12-21
 wkdaynum(1992-12-21) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 28 December, 1992
+../tests/test.rem(390): Trig = Monday, 28 December, 1992
 $T => 1992-12-28
 wkdaynum(1992-12-28) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 4 January, 1993
+../tests/test.rem(390): Trig = Monday, 4 January, 1993
 $T => 1993-01-04
 wkdaynum(1993-01-04) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 11 January, 1993
+../tests/test.rem(390): Trig = Monday, 11 January, 1993
 $T => 1993-01-11
 wkdaynum(1993-01-11) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 18 January, 1993
+../tests/test.rem(390): Trig = Monday, 18 January, 1993
 $T => 1993-01-18
 wkdaynum(1993-01-18) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 25 January, 1993
+../tests/test.rem(390): Trig = Monday, 25 January, 1993
 $T => 1993-01-25
 wkdaynum(1993-01-25) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 1 February, 1993
+../tests/test.rem(390): Trig = Monday, 1 February, 1993
 $T => 1993-02-01
 wkdaynum(1993-02-01) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 8 February, 1993
+../tests/test.rem(390): Trig = Monday, 8 February, 1993
 $T => 1993-02-08
 wkdaynum(1993-02-08) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 15 February, 1993
+../tests/test.rem(390): Trig = Monday, 15 February, 1993
 $T => 1993-02-15
 wkdaynum(1993-02-15) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 22 February, 1993
+../tests/test.rem(390): Trig = Monday, 22 February, 1993
 $T => 1993-02-22
 wkdaynum(1993-02-22) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 1 March, 1993
+../tests/test.rem(390): Trig = Monday, 1 March, 1993
 $T => 1993-03-01
 wkdaynum(1993-03-01) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 8 March, 1993
+../tests/test.rem(390): Trig = Monday, 8 March, 1993
 $T => 1993-03-08
 wkdaynum(1993-03-08) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 15 March, 1993
+../tests/test.rem(390): Trig = Monday, 15 March, 1993
 $T => 1993-03-15
 wkdaynum(1993-03-15) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 22 March, 1993
+../tests/test.rem(390): Trig = Monday, 22 March, 1993
 $T => 1993-03-22
 wkdaynum(1993-03-22) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 29 March, 1993
+../tests/test.rem(390): Trig = Monday, 29 March, 1993
 $T => 1993-03-29
 wkdaynum(1993-03-29) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 5 April, 1993
+../tests/test.rem(390): Trig = Monday, 5 April, 1993
 $T => 1993-04-05
 wkdaynum(1993-04-05) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 12 April, 1993
+../tests/test.rem(390): Trig = Monday, 12 April, 1993
 $T => 1993-04-12
 wkdaynum(1993-04-12) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 19 April, 1993
+../tests/test.rem(390): Trig = Monday, 19 April, 1993
 $T => 1993-04-19
 wkdaynum(1993-04-19) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 26 April, 1993
+../tests/test.rem(390): Trig = Monday, 26 April, 1993
 $T => 1993-04-26
 wkdaynum(1993-04-26) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 3 May, 1993
+../tests/test.rem(390): Trig = Monday, 3 May, 1993
 $T => 1993-05-03
 wkdaynum(1993-05-03) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 10 May, 1993
+../tests/test.rem(390): Trig = Monday, 10 May, 1993
 $T => 1993-05-10
 wkdaynum(1993-05-10) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 17 May, 1993
+../tests/test.rem(390): Trig = Monday, 17 May, 1993
 $T => 1993-05-17
 wkdaynum(1993-05-17) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 24 May, 1993
+../tests/test.rem(390): Trig = Monday, 24 May, 1993
 $T => 1993-05-24
 wkdaynum(1993-05-24) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 31 May, 1993
+../tests/test.rem(390): Trig = Monday, 31 May, 1993
 $T => 1993-05-31
 wkdaynum(1993-05-31) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 7 June, 1993
+../tests/test.rem(390): Trig = Monday, 7 June, 1993
 $T => 1993-06-07
 wkdaynum(1993-06-07) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 14 June, 1993
+../tests/test.rem(390): Trig = Monday, 14 June, 1993
 $T => 1993-06-14
 wkdaynum(1993-06-14) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 21 June, 1993
+../tests/test.rem(390): Trig = Monday, 21 June, 1993
 $T => 1993-06-21
 wkdaynum(1993-06-21) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 28 June, 1993
+../tests/test.rem(390): Trig = Monday, 28 June, 1993
 $T => 1993-06-28
 wkdaynum(1993-06-28) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 5 July, 1993
+../tests/test.rem(390): Trig = Monday, 5 July, 1993
 $T => 1993-07-05
 wkdaynum(1993-07-05) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 12 July, 1993
+../tests/test.rem(390): Trig = Monday, 12 July, 1993
 $T => 1993-07-12
 wkdaynum(1993-07-12) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 19 July, 1993
+../tests/test.rem(390): Trig = Monday, 19 July, 1993
 $T => 1993-07-19
 wkdaynum(1993-07-19) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 26 July, 1993
+../tests/test.rem(390): Trig = Monday, 26 July, 1993
 $T => 1993-07-26
 wkdaynum(1993-07-26) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 2 August, 1993
+../tests/test.rem(390): Trig = Monday, 2 August, 1993
 $T => 1993-08-02
 wkdaynum(1993-08-02) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 9 August, 1993
+../tests/test.rem(390): Trig = Monday, 9 August, 1993
 $T => 1993-08-09
 wkdaynum(1993-08-09) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 16 August, 1993
+../tests/test.rem(390): Trig = Monday, 16 August, 1993
 $T => 1993-08-16
 wkdaynum(1993-08-16) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 23 August, 1993
+../tests/test.rem(390): Trig = Monday, 23 August, 1993
 $T => 1993-08-23
 wkdaynum(1993-08-23) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 30 August, 1993
+../tests/test.rem(390): Trig = Monday, 30 August, 1993
 $T => 1993-08-30
 wkdaynum(1993-08-30) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 6 September, 1993
+../tests/test.rem(390): Trig = Monday, 6 September, 1993
 $T => 1993-09-06
 wkdaynum(1993-09-06) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 13 September, 1993
+../tests/test.rem(390): Trig = Monday, 13 September, 1993
 $T => 1993-09-13
 wkdaynum(1993-09-13) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 20 September, 1993
+../tests/test.rem(390): Trig = Monday, 20 September, 1993
 $T => 1993-09-20
 wkdaynum(1993-09-20) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 27 September, 1993
+../tests/test.rem(390): Trig = Monday, 27 September, 1993
 $T => 1993-09-27
 wkdaynum(1993-09-27) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 4 October, 1993
+../tests/test.rem(390): Trig = Monday, 4 October, 1993
 $T => 1993-10-04
 wkdaynum(1993-10-04) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 11 October, 1993
+../tests/test.rem(390): Trig = Monday, 11 October, 1993
 $T => 1993-10-11
 wkdaynum(1993-10-11) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 18 October, 1993
+../tests/test.rem(390): Trig = Monday, 18 October, 1993
 $T => 1993-10-18
 wkdaynum(1993-10-18) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 25 October, 1993
+../tests/test.rem(390): Trig = Monday, 25 October, 1993
 $T => 1993-10-25
 wkdaynum(1993-10-25) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 1 November, 1993
+../tests/test.rem(390): Trig = Monday, 1 November, 1993
 $T => 1993-11-01
 wkdaynum(1993-11-01) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 8 November, 1993
+../tests/test.rem(390): Trig = Monday, 8 November, 1993
 $T => 1993-11-08
 wkdaynum(1993-11-08) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 15 November, 1993
+../tests/test.rem(390): Trig = Monday, 15 November, 1993
 $T => 1993-11-15
 wkdaynum(1993-11-15) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 22 November, 1993
+../tests/test.rem(390): Trig = Monday, 22 November, 1993
 $T => 1993-11-22
 wkdaynum(1993-11-22) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 29 November, 1993
+../tests/test.rem(390): Trig = Monday, 29 November, 1993
 $T => 1993-11-29
 wkdaynum(1993-11-29) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 6 December, 1993
+../tests/test.rem(390): Trig = Monday, 6 December, 1993
 $T => 1993-12-06
 wkdaynum(1993-12-06) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 13 December, 1993
+../tests/test.rem(390): Trig = Monday, 13 December, 1993
 $T => 1993-12-13
 wkdaynum(1993-12-13) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 20 December, 1993
+../tests/test.rem(390): Trig = Monday, 20 December, 1993
 $T => 1993-12-20
 wkdaynum(1993-12-20) => 1
 1 == 3 => 0
-../tests/test.rem(381): Trig = Monday, 27 December, 1993
+../tests/test.rem(390): Trig = Monday, 27 December, 1993
 $T => 1993-12-27
 wkdaynum(1993-12-27) => 1
 1 == 3 => 0
-../tests/test.rem(381): Can't compute trigger
+../tests/test.rem(390): Can't compute trigger
 
 # These will just silently not trigger
 REM MAYBE-UNCOMPUTABLE Mon OMIT Mon SKIP MSG Never ever ever...
 REM MAYBE-UNCOMPUTABLE Mon SATISFY [wkdaynum($T) == 3] MSG Nope nope...
-../tests/test.rem(385): Trig = Monday, 18 February, 1991
+../tests/test.rem(394): Trig = Monday, 18 February, 1991
 $T => 1991-02-18
 wkdaynum(1991-02-18) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 25 February, 1991
+../tests/test.rem(394): Trig = Monday, 25 February, 1991
 $T => 1991-02-25
 wkdaynum(1991-02-25) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 4 March, 1991
+../tests/test.rem(394): Trig = Monday, 4 March, 1991
 $T => 1991-03-04
 wkdaynum(1991-03-04) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 11 March, 1991
+../tests/test.rem(394): Trig = Monday, 11 March, 1991
 $T => 1991-03-11
 wkdaynum(1991-03-11) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 18 March, 1991
+../tests/test.rem(394): Trig = Monday, 18 March, 1991
 $T => 1991-03-18
 wkdaynum(1991-03-18) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 25 March, 1991
+../tests/test.rem(394): Trig = Monday, 25 March, 1991
 $T => 1991-03-25
 wkdaynum(1991-03-25) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 1 April, 1991
+../tests/test.rem(394): Trig = Monday, 1 April, 1991
 $T => 1991-04-01
 wkdaynum(1991-04-01) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 8 April, 1991
+../tests/test.rem(394): Trig = Monday, 8 April, 1991
 $T => 1991-04-08
 wkdaynum(1991-04-08) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 15 April, 1991
+../tests/test.rem(394): Trig = Monday, 15 April, 1991
 $T => 1991-04-15
 wkdaynum(1991-04-15) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 22 April, 1991
+../tests/test.rem(394): Trig = Monday, 22 April, 1991
 $T => 1991-04-22
 wkdaynum(1991-04-22) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 29 April, 1991
+../tests/test.rem(394): Trig = Monday, 29 April, 1991
 $T => 1991-04-29
 wkdaynum(1991-04-29) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 6 May, 1991
+../tests/test.rem(394): Trig = Monday, 6 May, 1991
 $T => 1991-05-06
 wkdaynum(1991-05-06) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 13 May, 1991
+../tests/test.rem(394): Trig = Monday, 13 May, 1991
 $T => 1991-05-13
 wkdaynum(1991-05-13) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 20 May, 1991
+../tests/test.rem(394): Trig = Monday, 20 May, 1991
 $T => 1991-05-20
 wkdaynum(1991-05-20) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 27 May, 1991
+../tests/test.rem(394): Trig = Monday, 27 May, 1991
 $T => 1991-05-27
 wkdaynum(1991-05-27) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 3 June, 1991
+../tests/test.rem(394): Trig = Monday, 3 June, 1991
 $T => 1991-06-03
 wkdaynum(1991-06-03) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 10 June, 1991
+../tests/test.rem(394): Trig = Monday, 10 June, 1991
 $T => 1991-06-10
 wkdaynum(1991-06-10) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 17 June, 1991
+../tests/test.rem(394): Trig = Monday, 17 June, 1991
 $T => 1991-06-17
 wkdaynum(1991-06-17) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 24 June, 1991
+../tests/test.rem(394): Trig = Monday, 24 June, 1991
 $T => 1991-06-24
 wkdaynum(1991-06-24) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 1 July, 1991
+../tests/test.rem(394): Trig = Monday, 1 July, 1991
 $T => 1991-07-01
 wkdaynum(1991-07-01) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 8 July, 1991
+../tests/test.rem(394): Trig = Monday, 8 July, 1991
 $T => 1991-07-08
 wkdaynum(1991-07-08) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 15 July, 1991
+../tests/test.rem(394): Trig = Monday, 15 July, 1991
 $T => 1991-07-15
 wkdaynum(1991-07-15) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 22 July, 1991
+../tests/test.rem(394): Trig = Monday, 22 July, 1991
 $T => 1991-07-22
 wkdaynum(1991-07-22) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 29 July, 1991
+../tests/test.rem(394): Trig = Monday, 29 July, 1991
 $T => 1991-07-29
 wkdaynum(1991-07-29) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 5 August, 1991
+../tests/test.rem(394): Trig = Monday, 5 August, 1991
 $T => 1991-08-05
 wkdaynum(1991-08-05) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 12 August, 1991
+../tests/test.rem(394): Trig = Monday, 12 August, 1991
 $T => 1991-08-12
 wkdaynum(1991-08-12) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 19 August, 1991
+../tests/test.rem(394): Trig = Monday, 19 August, 1991
 $T => 1991-08-19
 wkdaynum(1991-08-19) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 26 August, 1991
+../tests/test.rem(394): Trig = Monday, 26 August, 1991
 $T => 1991-08-26
 wkdaynum(1991-08-26) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 2 September, 1991
+../tests/test.rem(394): Trig = Monday, 2 September, 1991
 $T => 1991-09-02
 wkdaynum(1991-09-02) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 9 September, 1991
+../tests/test.rem(394): Trig = Monday, 9 September, 1991
 $T => 1991-09-09
 wkdaynum(1991-09-09) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 16 September, 1991
+../tests/test.rem(394): Trig = Monday, 16 September, 1991
 $T => 1991-09-16
 wkdaynum(1991-09-16) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 23 September, 1991
+../tests/test.rem(394): Trig = Monday, 23 September, 1991
 $T => 1991-09-23
 wkdaynum(1991-09-23) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 30 September, 1991
+../tests/test.rem(394): Trig = Monday, 30 September, 1991
 $T => 1991-09-30
 wkdaynum(1991-09-30) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 7 October, 1991
+../tests/test.rem(394): Trig = Monday, 7 October, 1991
 $T => 1991-10-07
 wkdaynum(1991-10-07) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 14 October, 1991
+../tests/test.rem(394): Trig = Monday, 14 October, 1991
 $T => 1991-10-14
 wkdaynum(1991-10-14) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 21 October, 1991
+../tests/test.rem(394): Trig = Monday, 21 October, 1991
 $T => 1991-10-21
 wkdaynum(1991-10-21) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 28 October, 1991
+../tests/test.rem(394): Trig = Monday, 28 October, 1991
 $T => 1991-10-28
 wkdaynum(1991-10-28) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 4 November, 1991
+../tests/test.rem(394): Trig = Monday, 4 November, 1991
 $T => 1991-11-04
 wkdaynum(1991-11-04) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 11 November, 1991
+../tests/test.rem(394): Trig = Monday, 11 November, 1991
 $T => 1991-11-11
 wkdaynum(1991-11-11) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 18 November, 1991
+../tests/test.rem(394): Trig = Monday, 18 November, 1991
 $T => 1991-11-18
 wkdaynum(1991-11-18) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 25 November, 1991
+../tests/test.rem(394): Trig = Monday, 25 November, 1991
 $T => 1991-11-25
 wkdaynum(1991-11-25) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 2 December, 1991
+../tests/test.rem(394): Trig = Monday, 2 December, 1991
 $T => 1991-12-02
 wkdaynum(1991-12-02) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 9 December, 1991
+../tests/test.rem(394): Trig = Monday, 9 December, 1991
 $T => 1991-12-09
 wkdaynum(1991-12-09) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 16 December, 1991
+../tests/test.rem(394): Trig = Monday, 16 December, 1991
 $T => 1991-12-16
 wkdaynum(1991-12-16) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 23 December, 1991
+../tests/test.rem(394): Trig = Monday, 23 December, 1991
 $T => 1991-12-23
 wkdaynum(1991-12-23) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 30 December, 1991
+../tests/test.rem(394): Trig = Monday, 30 December, 1991
 $T => 1991-12-30
 wkdaynum(1991-12-30) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 6 January, 1992
+../tests/test.rem(394): Trig = Monday, 6 January, 1992
 $T => 1992-01-06
 wkdaynum(1992-01-06) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 13 January, 1992
+../tests/test.rem(394): Trig = Monday, 13 January, 1992
 $T => 1992-01-13
 wkdaynum(1992-01-13) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 20 January, 1992
+../tests/test.rem(394): Trig = Monday, 20 January, 1992
 $T => 1992-01-20
 wkdaynum(1992-01-20) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 27 January, 1992
+../tests/test.rem(394): Trig = Monday, 27 January, 1992
 $T => 1992-01-27
 wkdaynum(1992-01-27) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 3 February, 1992
+../tests/test.rem(394): Trig = Monday, 3 February, 1992
 $T => 1992-02-03
 wkdaynum(1992-02-03) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 10 February, 1992
+../tests/test.rem(394): Trig = Monday, 10 February, 1992
 $T => 1992-02-10
 wkdaynum(1992-02-10) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 17 February, 1992
+../tests/test.rem(394): Trig = Monday, 17 February, 1992
 $T => 1992-02-17
 wkdaynum(1992-02-17) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 24 February, 1992
+../tests/test.rem(394): Trig = Monday, 24 February, 1992
 $T => 1992-02-24
 wkdaynum(1992-02-24) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 2 March, 1992
+../tests/test.rem(394): Trig = Monday, 2 March, 1992
 $T => 1992-03-02
 wkdaynum(1992-03-02) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 9 March, 1992
+../tests/test.rem(394): Trig = Monday, 9 March, 1992
 $T => 1992-03-09
 wkdaynum(1992-03-09) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 16 March, 1992
+../tests/test.rem(394): Trig = Monday, 16 March, 1992
 $T => 1992-03-16
 wkdaynum(1992-03-16) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 23 March, 1992
+../tests/test.rem(394): Trig = Monday, 23 March, 1992
 $T => 1992-03-23
 wkdaynum(1992-03-23) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 30 March, 1992
+../tests/test.rem(394): Trig = Monday, 30 March, 1992
 $T => 1992-03-30
 wkdaynum(1992-03-30) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 6 April, 1992
+../tests/test.rem(394): Trig = Monday, 6 April, 1992
 $T => 1992-04-06
 wkdaynum(1992-04-06) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 13 April, 1992
+../tests/test.rem(394): Trig = Monday, 13 April, 1992
 $T => 1992-04-13
 wkdaynum(1992-04-13) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 20 April, 1992
+../tests/test.rem(394): Trig = Monday, 20 April, 1992
 $T => 1992-04-20
 wkdaynum(1992-04-20) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 27 April, 1992
+../tests/test.rem(394): Trig = Monday, 27 April, 1992
 $T => 1992-04-27
 wkdaynum(1992-04-27) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 4 May, 1992
+../tests/test.rem(394): Trig = Monday, 4 May, 1992
 $T => 1992-05-04
 wkdaynum(1992-05-04) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 11 May, 1992
+../tests/test.rem(394): Trig = Monday, 11 May, 1992
 $T => 1992-05-11
 wkdaynum(1992-05-11) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 18 May, 1992
+../tests/test.rem(394): Trig = Monday, 18 May, 1992
 $T => 1992-05-18
 wkdaynum(1992-05-18) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 25 May, 1992
+../tests/test.rem(394): Trig = Monday, 25 May, 1992
 $T => 1992-05-25
 wkdaynum(1992-05-25) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 1 June, 1992
+../tests/test.rem(394): Trig = Monday, 1 June, 1992
 $T => 1992-06-01
 wkdaynum(1992-06-01) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 8 June, 1992
+../tests/test.rem(394): Trig = Monday, 8 June, 1992
 $T => 1992-06-08
 wkdaynum(1992-06-08) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 15 June, 1992
+../tests/test.rem(394): Trig = Monday, 15 June, 1992
 $T => 1992-06-15
 wkdaynum(1992-06-15) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 22 June, 1992
+../tests/test.rem(394): Trig = Monday, 22 June, 1992
 $T => 1992-06-22
 wkdaynum(1992-06-22) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 29 June, 1992
+../tests/test.rem(394): Trig = Monday, 29 June, 1992
 $T => 1992-06-29
 wkdaynum(1992-06-29) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 6 July, 1992
+../tests/test.rem(394): Trig = Monday, 6 July, 1992
 $T => 1992-07-06
 wkdaynum(1992-07-06) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 13 July, 1992
+../tests/test.rem(394): Trig = Monday, 13 July, 1992
 $T => 1992-07-13
 wkdaynum(1992-07-13) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 20 July, 1992
+../tests/test.rem(394): Trig = Monday, 20 July, 1992
 $T => 1992-07-20
 wkdaynum(1992-07-20) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 27 July, 1992
+../tests/test.rem(394): Trig = Monday, 27 July, 1992
 $T => 1992-07-27
 wkdaynum(1992-07-27) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 3 August, 1992
+../tests/test.rem(394): Trig = Monday, 3 August, 1992
 $T => 1992-08-03
 wkdaynum(1992-08-03) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 10 August, 1992
+../tests/test.rem(394): Trig = Monday, 10 August, 1992
 $T => 1992-08-10
 wkdaynum(1992-08-10) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 17 August, 1992
+../tests/test.rem(394): Trig = Monday, 17 August, 1992
 $T => 1992-08-17
 wkdaynum(1992-08-17) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 24 August, 1992
+../tests/test.rem(394): Trig = Monday, 24 August, 1992
 $T => 1992-08-24
 wkdaynum(1992-08-24) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 31 August, 1992
+../tests/test.rem(394): Trig = Monday, 31 August, 1992
 $T => 1992-08-31
 wkdaynum(1992-08-31) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 7 September, 1992
+../tests/test.rem(394): Trig = Monday, 7 September, 1992
 $T => 1992-09-07
 wkdaynum(1992-09-07) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 14 September, 1992
+../tests/test.rem(394): Trig = Monday, 14 September, 1992
 $T => 1992-09-14
 wkdaynum(1992-09-14) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 21 September, 1992
+../tests/test.rem(394): Trig = Monday, 21 September, 1992
 $T => 1992-09-21
 wkdaynum(1992-09-21) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 28 September, 1992
+../tests/test.rem(394): Trig = Monday, 28 September, 1992
 $T => 1992-09-28
 wkdaynum(1992-09-28) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 5 October, 1992
+../tests/test.rem(394): Trig = Monday, 5 October, 1992
 $T => 1992-10-05
 wkdaynum(1992-10-05) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 12 October, 1992
+../tests/test.rem(394): Trig = Monday, 12 October, 1992
 $T => 1992-10-12
 wkdaynum(1992-10-12) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 19 October, 1992
+../tests/test.rem(394): Trig = Monday, 19 October, 1992
 $T => 1992-10-19
 wkdaynum(1992-10-19) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 26 October, 1992
+../tests/test.rem(394): Trig = Monday, 26 October, 1992
 $T => 1992-10-26
 wkdaynum(1992-10-26) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 2 November, 1992
+../tests/test.rem(394): Trig = Monday, 2 November, 1992
 $T => 1992-11-02
 wkdaynum(1992-11-02) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 9 November, 1992
+../tests/test.rem(394): Trig = Monday, 9 November, 1992
 $T => 1992-11-09
 wkdaynum(1992-11-09) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 16 November, 1992
+../tests/test.rem(394): Trig = Monday, 16 November, 1992
 $T => 1992-11-16
 wkdaynum(1992-11-16) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 23 November, 1992
+../tests/test.rem(394): Trig = Monday, 23 November, 1992
 $T => 1992-11-23
 wkdaynum(1992-11-23) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 30 November, 1992
+../tests/test.rem(394): Trig = Monday, 30 November, 1992
 $T => 1992-11-30
 wkdaynum(1992-11-30) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 7 December, 1992
+../tests/test.rem(394): Trig = Monday, 7 December, 1992
 $T => 1992-12-07
 wkdaynum(1992-12-07) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 14 December, 1992
+../tests/test.rem(394): Trig = Monday, 14 December, 1992
 $T => 1992-12-14
 wkdaynum(1992-12-14) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 21 December, 1992
+../tests/test.rem(394): Trig = Monday, 21 December, 1992
 $T => 1992-12-21
 wkdaynum(1992-12-21) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 28 December, 1992
+../tests/test.rem(394): Trig = Monday, 28 December, 1992
 $T => 1992-12-28
 wkdaynum(1992-12-28) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 4 January, 1993
+../tests/test.rem(394): Trig = Monday, 4 January, 1993
 $T => 1993-01-04
 wkdaynum(1993-01-04) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 11 January, 1993
+../tests/test.rem(394): Trig = Monday, 11 January, 1993
 $T => 1993-01-11
 wkdaynum(1993-01-11) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 18 January, 1993
+../tests/test.rem(394): Trig = Monday, 18 January, 1993
 $T => 1993-01-18
 wkdaynum(1993-01-18) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 25 January, 1993
+../tests/test.rem(394): Trig = Monday, 25 January, 1993
 $T => 1993-01-25
 wkdaynum(1993-01-25) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 1 February, 1993
+../tests/test.rem(394): Trig = Monday, 1 February, 1993
 $T => 1993-02-01
 wkdaynum(1993-02-01) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 8 February, 1993
+../tests/test.rem(394): Trig = Monday, 8 February, 1993
 $T => 1993-02-08
 wkdaynum(1993-02-08) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 15 February, 1993
+../tests/test.rem(394): Trig = Monday, 15 February, 1993
 $T => 1993-02-15
 wkdaynum(1993-02-15) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 22 February, 1993
+../tests/test.rem(394): Trig = Monday, 22 February, 1993
 $T => 1993-02-22
 wkdaynum(1993-02-22) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 1 March, 1993
+../tests/test.rem(394): Trig = Monday, 1 March, 1993
 $T => 1993-03-01
 wkdaynum(1993-03-01) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 8 March, 1993
+../tests/test.rem(394): Trig = Monday, 8 March, 1993
 $T => 1993-03-08
 wkdaynum(1993-03-08) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 15 March, 1993
+../tests/test.rem(394): Trig = Monday, 15 March, 1993
 $T => 1993-03-15
 wkdaynum(1993-03-15) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 22 March, 1993
+../tests/test.rem(394): Trig = Monday, 22 March, 1993
 $T => 1993-03-22
 wkdaynum(1993-03-22) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 29 March, 1993
+../tests/test.rem(394): Trig = Monday, 29 March, 1993
 $T => 1993-03-29
 wkdaynum(1993-03-29) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 5 April, 1993
+../tests/test.rem(394): Trig = Monday, 5 April, 1993
 $T => 1993-04-05
 wkdaynum(1993-04-05) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 12 April, 1993
+../tests/test.rem(394): Trig = Monday, 12 April, 1993
 $T => 1993-04-12
 wkdaynum(1993-04-12) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 19 April, 1993
+../tests/test.rem(394): Trig = Monday, 19 April, 1993
 $T => 1993-04-19
 wkdaynum(1993-04-19) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 26 April, 1993
+../tests/test.rem(394): Trig = Monday, 26 April, 1993
 $T => 1993-04-26
 wkdaynum(1993-04-26) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 3 May, 1993
+../tests/test.rem(394): Trig = Monday, 3 May, 1993
 $T => 1993-05-03
 wkdaynum(1993-05-03) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 10 May, 1993
+../tests/test.rem(394): Trig = Monday, 10 May, 1993
 $T => 1993-05-10
 wkdaynum(1993-05-10) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 17 May, 1993
+../tests/test.rem(394): Trig = Monday, 17 May, 1993
 $T => 1993-05-17
 wkdaynum(1993-05-17) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 24 May, 1993
+../tests/test.rem(394): Trig = Monday, 24 May, 1993
 $T => 1993-05-24
 wkdaynum(1993-05-24) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 31 May, 1993
+../tests/test.rem(394): Trig = Monday, 31 May, 1993
 $T => 1993-05-31
 wkdaynum(1993-05-31) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 7 June, 1993
+../tests/test.rem(394): Trig = Monday, 7 June, 1993
 $T => 1993-06-07
 wkdaynum(1993-06-07) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 14 June, 1993
+../tests/test.rem(394): Trig = Monday, 14 June, 1993
 $T => 1993-06-14
 wkdaynum(1993-06-14) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 21 June, 1993
+../tests/test.rem(394): Trig = Monday, 21 June, 1993
 $T => 1993-06-21
 wkdaynum(1993-06-21) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 28 June, 1993
+../tests/test.rem(394): Trig = Monday, 28 June, 1993
 $T => 1993-06-28
 wkdaynum(1993-06-28) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 5 July, 1993
+../tests/test.rem(394): Trig = Monday, 5 July, 1993
 $T => 1993-07-05
 wkdaynum(1993-07-05) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 12 July, 1993
+../tests/test.rem(394): Trig = Monday, 12 July, 1993
 $T => 1993-07-12
 wkdaynum(1993-07-12) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 19 July, 1993
+../tests/test.rem(394): Trig = Monday, 19 July, 1993
 $T => 1993-07-19
 wkdaynum(1993-07-19) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 26 July, 1993
+../tests/test.rem(394): Trig = Monday, 26 July, 1993
 $T => 1993-07-26
 wkdaynum(1993-07-26) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 2 August, 1993
+../tests/test.rem(394): Trig = Monday, 2 August, 1993
 $T => 1993-08-02
 wkdaynum(1993-08-02) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 9 August, 1993
+../tests/test.rem(394): Trig = Monday, 9 August, 1993
 $T => 1993-08-09
 wkdaynum(1993-08-09) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 16 August, 1993
+../tests/test.rem(394): Trig = Monday, 16 August, 1993
 $T => 1993-08-16
 wkdaynum(1993-08-16) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 23 August, 1993
+../tests/test.rem(394): Trig = Monday, 23 August, 1993
 $T => 1993-08-23
 wkdaynum(1993-08-23) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 30 August, 1993
+../tests/test.rem(394): Trig = Monday, 30 August, 1993
 $T => 1993-08-30
 wkdaynum(1993-08-30) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 6 September, 1993
+../tests/test.rem(394): Trig = Monday, 6 September, 1993
 $T => 1993-09-06
 wkdaynum(1993-09-06) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 13 September, 1993
+../tests/test.rem(394): Trig = Monday, 13 September, 1993
 $T => 1993-09-13
 wkdaynum(1993-09-13) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 20 September, 1993
+../tests/test.rem(394): Trig = Monday, 20 September, 1993
 $T => 1993-09-20
 wkdaynum(1993-09-20) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 27 September, 1993
+../tests/test.rem(394): Trig = Monday, 27 September, 1993
 $T => 1993-09-27
 wkdaynum(1993-09-27) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 4 October, 1993
+../tests/test.rem(394): Trig = Monday, 4 October, 1993
 $T => 1993-10-04
 wkdaynum(1993-10-04) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 11 October, 1993
+../tests/test.rem(394): Trig = Monday, 11 October, 1993
 $T => 1993-10-11
 wkdaynum(1993-10-11) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 18 October, 1993
+../tests/test.rem(394): Trig = Monday, 18 October, 1993
 $T => 1993-10-18
 wkdaynum(1993-10-18) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 25 October, 1993
+../tests/test.rem(394): Trig = Monday, 25 October, 1993
 $T => 1993-10-25
 wkdaynum(1993-10-25) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 1 November, 1993
+../tests/test.rem(394): Trig = Monday, 1 November, 1993
 $T => 1993-11-01
 wkdaynum(1993-11-01) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 8 November, 1993
+../tests/test.rem(394): Trig = Monday, 8 November, 1993
 $T => 1993-11-08
 wkdaynum(1993-11-08) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 15 November, 1993
+../tests/test.rem(394): Trig = Monday, 15 November, 1993
 $T => 1993-11-15
 wkdaynum(1993-11-15) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 22 November, 1993
+../tests/test.rem(394): Trig = Monday, 22 November, 1993
 $T => 1993-11-22
 wkdaynum(1993-11-22) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 29 November, 1993
+../tests/test.rem(394): Trig = Monday, 29 November, 1993
 $T => 1993-11-29
 wkdaynum(1993-11-29) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 6 December, 1993
+../tests/test.rem(394): Trig = Monday, 6 December, 1993
 $T => 1993-12-06
 wkdaynum(1993-12-06) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 13 December, 1993
+../tests/test.rem(394): Trig = Monday, 13 December, 1993
 $T => 1993-12-13
 wkdaynum(1993-12-13) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 20 December, 1993
+../tests/test.rem(394): Trig = Monday, 20 December, 1993
 $T => 1993-12-20
 wkdaynum(1993-12-20) => 1
 1 == 3 => 0
-../tests/test.rem(385): Trig = Monday, 27 December, 1993
+../tests/test.rem(394): Trig = Monday, 27 December, 1993
 $T => 1993-12-27
 wkdaynum(1993-12-27) => 1
 1 == 3 => 0
@@ -2525,10 +2590,10 @@ Variable  Value
 $aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: Name too long
 OMIT 2010-09-03 THROUGH 2010-09-15
 OMIT December 25 MSG X
-../tests/test.rem(390): Trig = Wednesday, 25 December, 1991
+../tests/test.rem(399): Trig = Wednesday, 25 December, 1991
 # Next should give a parse error
 OMIT 26 Dec 2010 THROUGH 27 Dec 2010 MSG This is not legal
-../tests/test.rem(392): Trig = Sunday, 26 December, 2010
+../tests/test.rem(401): Trig = Sunday, 26 December, 2010
 OMIT DUMP
 Global Full OMITs (16 of maximum allowed 500):
 	1991-03-11
@@ -2560,287 +2625,287 @@ a => 5761
 hebdate(14, "Adar", 1991-02-16, 5761) => 1991-02-28
 trigger(1991-02-28) => "28 February 1991"
 Leaving UserFN _i() => "28 February 1991"
-../tests/test.rem(395): Trig = Thursday, 28 February, 1991
+../tests/test.rem(404): Trig = Thursday, 28 February, 1991
 
 # Regression test for bug found by Larry Hynes
 REM SATISFY [day(trigdate()-25) == 14] MSG Foo
-../tests/test.rem(398): Trig = Saturday, 16 February, 1991
+../tests/test.rem(407): Trig = Saturday, 16 February, 1991
 trigdate() => 1991-02-16
 1991-02-16 - 25 => 1991-01-22
 day(1991-01-22) => 22
 22 == 14 => 0
-../tests/test.rem(398): Trig = Sunday, 17 February, 1991
+../tests/test.rem(407): Trig = Sunday, 17 February, 1991
 trigdate() => 1991-02-17
 1991-02-17 - 25 => 1991-01-23
 day(1991-01-23) => 23
 23 == 14 => 0
-../tests/test.rem(398): Trig = Monday, 18 February, 1991
+../tests/test.rem(407): Trig = Monday, 18 February, 1991
 trigdate() => 1991-02-18
 1991-02-18 - 25 => 1991-01-24
 day(1991-01-24) => 24
 24 == 14 => 0
-../tests/test.rem(398): Trig = Tuesday, 19 February, 1991
+../tests/test.rem(407): Trig = Tuesday, 19 February, 1991
 trigdate() => 1991-02-19
 1991-02-19 - 25 => 1991-01-25
 day(1991-01-25) => 25
 25 == 14 => 0
-../tests/test.rem(398): Trig = Wednesday, 20 February, 1991
+../tests/test.rem(407): Trig = Wednesday, 20 February, 1991
 trigdate() => 1991-02-20
 1991-02-20 - 25 => 1991-01-26
 day(1991-01-26) => 26
 26 == 14 => 0
-../tests/test.rem(398): Trig = Thursday, 21 February, 1991
+../tests/test.rem(407): Trig = Thursday, 21 February, 1991
 trigdate() => 1991-02-21
 1991-02-21 - 25 => 1991-01-27
 day(1991-01-27) => 27
 27 == 14 => 0
-../tests/test.rem(398): Trig = Friday, 22 February, 1991
+../tests/test.rem(407): Trig = Friday, 22 February, 1991
 trigdate() => 1991-02-22
 1991-02-22 - 25 => 1991-01-28
 day(1991-01-28) => 28
 28 == 14 => 0
-../tests/test.rem(398): Trig = Saturday, 23 February, 1991
+../tests/test.rem(407): Trig = Saturday, 23 February, 1991
 trigdate() => 1991-02-23
 1991-02-23 - 25 => 1991-01-29
 day(1991-01-29) => 29
 29 == 14 => 0
-../tests/test.rem(398): Trig = Sunday, 24 February, 1991
+../tests/test.rem(407): Trig = Sunday, 24 February, 1991
 trigdate() => 1991-02-24
 1991-02-24 - 25 => 1991-01-30
 day(1991-01-30) => 30
 30 == 14 => 0
-../tests/test.rem(398): Trig = Monday, 25 February, 1991
+../tests/test.rem(407): Trig = Monday, 25 February, 1991
 trigdate() => 1991-02-25
 1991-02-25 - 25 => 1991-01-31
 day(1991-01-31) => 31
 31 == 14 => 0
-../tests/test.rem(398): Trig = Tuesday, 26 February, 1991
+../tests/test.rem(407): Trig = Tuesday, 26 February, 1991
 trigdate() => 1991-02-26
 1991-02-26 - 25 => 1991-02-01
 day(1991-02-01) => 1
 1 == 14 => 0
-../tests/test.rem(398): Trig = Wednesday, 27 February, 1991
+../tests/test.rem(407): Trig = Wednesday, 27 February, 1991
 trigdate() => 1991-02-27
 1991-02-27 - 25 => 1991-02-02
 day(1991-02-02) => 2
 2 == 14 => 0
-../tests/test.rem(398): Trig = Thursday, 28 February, 1991
+../tests/test.rem(407): Trig = Thursday, 28 February, 1991
 trigdate() => 1991-02-28
 1991-02-28 - 25 => 1991-02-03
 day(1991-02-03) => 3
 3 == 14 => 0
-../tests/test.rem(398): Trig = Friday, 1 March, 1991
+../tests/test.rem(407): Trig = Friday, 1 March, 1991
 trigdate() => 1991-03-01
 1991-03-01 - 25 => 1991-02-04
 day(1991-02-04) => 4
 4 == 14 => 0
-../tests/test.rem(398): Trig = Saturday, 2 March, 1991
+../tests/test.rem(407): Trig = Saturday, 2 March, 1991
 trigdate() => 1991-03-02
 1991-03-02 - 25 => 1991-02-05
 day(1991-02-05) => 5
 5 == 14 => 0
-../tests/test.rem(398): Trig = Sunday, 3 March, 1991
+../tests/test.rem(407): Trig = Sunday, 3 March, 1991
 trigdate() => 1991-03-03
 1991-03-03 - 25 => 1991-02-06
 day(1991-02-06) => 6
 6 == 14 => 0
-../tests/test.rem(398): Trig = Monday, 4 March, 1991
+../tests/test.rem(407): Trig = Monday, 4 March, 1991
 trigdate() => 1991-03-04
 1991-03-04 - 25 => 1991-02-07
 day(1991-02-07) => 7
 7 == 14 => 0
-../tests/test.rem(398): Trig = Tuesday, 5 March, 1991
+../tests/test.rem(407): Trig = Tuesday, 5 March, 1991
 trigdate() => 1991-03-05
 1991-03-05 - 25 => 1991-02-08
 day(1991-02-08) => 8
 8 == 14 => 0
-../tests/test.rem(398): Trig = Wednesday, 6 March, 1991
+../tests/test.rem(407): Trig = Wednesday, 6 March, 1991
 trigdate() => 1991-03-06
 1991-03-06 - 25 => 1991-02-09
 day(1991-02-09) => 9
 9 == 14 => 0
-../tests/test.rem(398): Trig = Thursday, 7 March, 1991
+../tests/test.rem(407): Trig = Thursday, 7 March, 1991
 trigdate() => 1991-03-07
 1991-03-07 - 25 => 1991-02-10
 day(1991-02-10) => 10
 10 == 14 => 0
-../tests/test.rem(398): Trig = Friday, 8 March, 1991
+../tests/test.rem(407): Trig = Friday, 8 March, 1991
 trigdate() => 1991-03-08
 1991-03-08 - 25 => 1991-02-11
 day(1991-02-11) => 11
 11 == 14 => 0
-../tests/test.rem(398): Trig = Saturday, 9 March, 1991
+../tests/test.rem(407): Trig = Saturday, 9 March, 1991
 trigdate() => 1991-03-09
 1991-03-09 - 25 => 1991-02-12
 day(1991-02-12) => 12
 12 == 14 => 0
-../tests/test.rem(398): Trig = Sunday, 10 March, 1991
+../tests/test.rem(407): Trig = Sunday, 10 March, 1991
 trigdate() => 1991-03-10
 1991-03-10 - 25 => 1991-02-13
 day(1991-02-13) => 13
 13 == 14 => 0
-../tests/test.rem(398): Trig = Monday, 11 March, 1991
+../tests/test.rem(407): Trig = Monday, 11 March, 1991
 trigdate() => 1991-03-11
 1991-03-11 - 25 => 1991-02-14
 day(1991-02-14) => 14
 14 == 14 => 1
-../tests/test.rem(398): Trig(satisfied) = Monday, 11 March, 1991
+../tests/test.rem(407): Trig(satisfied) = Monday, 11 March, 1991
 
 # Check combo of SATISFY and long-duration events
 REM 14 SATISFY [$Tw == 4] MSG Thursday, the 14th
-../tests/test.rem(401): Trig = Thursday, 14 March, 1991
+../tests/test.rem(410): Trig = Thursday, 14 March, 1991
 $Tw => 4
 4 == 4 => 1
-../tests/test.rem(401): Trig(satisfied) = Thursday, 14 March, 1991
+../tests/test.rem(410): Trig(satisfied) = Thursday, 14 March, 1991
 REM 14 AT 16:00 DURATION 8:00 SATISFY [$Tw == 4] MSG Thursday, the 14th
-../tests/test.rem(402): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 08:00
+../tests/test.rem(411): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 08:00
 $Tw => 4
 4 == 4 => 1
-../tests/test.rem(402): Trig(satisfied) = Thursday, 14 March, 1991 AT 16:00 DURATION 08:00
+../tests/test.rem(411): Trig(satisfied) = Thursday, 14 March, 1991 AT 16:00 DURATION 08:00
 REM 14 AT 16:00 DURATION 8:01 SATISFY [$Tw == 4] MSG Thursday, the 14th
-../tests/test.rem(403): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 08:01
-../tests/test.rem(403): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 08:01
+../tests/test.rem(412): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 08:01
+../tests/test.rem(412): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 08:01
 $Tw => 4
 4 == 4 => 1
-../tests/test.rem(403): Trig(satisfied) = Thursday, 14 March, 1991 AT 16:00 DURATION 08:01
+../tests/test.rem(412): Trig(satisfied) = Thursday, 14 March, 1991 AT 16:00 DURATION 08:01
 REM 14 AT 16:00 DURATION 32:00 SATISFY [$Tw == 4] MSG Thursday, the 14th
-../tests/test.rem(404): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 32:00
-../tests/test.rem(404): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 32:00
+../tests/test.rem(413): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 32:00
+../tests/test.rem(413): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 32:00
 $Tw => 4
 4 == 4 => 1
-../tests/test.rem(404): Trig(satisfied) = Thursday, 14 March, 1991 AT 16:00 DURATION 32:00
+../tests/test.rem(413): Trig(satisfied) = Thursday, 14 March, 1991 AT 16:00 DURATION 32:00
 REM 14 AT 16:00 DURATION 32:01 SATISFY [$Tw == 4] MSG Thursday, the 14th
-../tests/test.rem(405): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 32:01
-../tests/test.rem(405): Trig = Thursday, 14 February, 1991 AT 16:00 DURATION 32:01
+../tests/test.rem(414): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 32:01
+../tests/test.rem(414): Trig = Thursday, 14 February, 1991 AT 16:00 DURATION 32:01
 $Tw => 4
 4 == 4 => 1
-../tests/test.rem(405): Trig(adj) = Saturday, 16 February, 1991 AT 00:00 DURATION 00:01
-../tests/test.rem(405): Trig(satisfied) = Saturday, 16 February, 1991 AT 00:00 DURATION 00:01
+../tests/test.rem(414): Trig(adj) = Saturday, 16 February, 1991 AT 00:00 DURATION 00:01
+../tests/test.rem(414): Trig(satisfied) = Saturday, 16 February, 1991 AT 00:00 DURATION 00:01
 Thursday, the 14th
 
 REM 14 AT 16:00 DURATION 40:00 SATISFY [$Tw == 4] MSG Thursday, the 14th
-../tests/test.rem(406): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 40:00
-../tests/test.rem(406): Trig = Thursday, 14 February, 1991 AT 16:00 DURATION 40:00
+../tests/test.rem(415): Trig = Thursday, 14 March, 1991 AT 16:00 DURATION 40:00
+../tests/test.rem(415): Trig = Thursday, 14 February, 1991 AT 16:00 DURATION 40:00
 $Tw => 4
 4 == 4 => 1
-../tests/test.rem(406): Trig(adj) = Saturday, 16 February, 1991 AT 00:00 DURATION 08:00
-../tests/test.rem(406): Trig(satisfied) = Saturday, 16 February, 1991 AT 00:00 DURATION 08:00
+../tests/test.rem(415): Trig(adj) = Saturday, 16 February, 1991 AT 00:00 DURATION 08:00
+../tests/test.rem(415): Trig(satisfied) = Saturday, 16 February, 1991 AT 00:00 DURATION 08:00
 Thursday, the 14th
 
 
 # This is now an error
 REM DURATION 15:00 MSG Should fail... need AT if you have DURATION.
-../tests/test.rem(409): Cannot specify DURATION without specifying AT
+../tests/test.rem(418): Cannot specify DURATION without specifying AT
 
 # Parsing of AM/PM times
 REM AT 0:00am MSG foo 0a
-../tests/test.rem(412): Expecting time after AT
+../tests/test.rem(421): Expecting time after AT
 REM AT 1:00AM MSG foo 1a
-../tests/test.rem(413): Trig = Saturday, 16 February, 1991 AT 01:00
+../tests/test.rem(422): Trig = Saturday, 16 February, 1991 AT 01:00
 foo 1a
 
 REM AT 2:00am MSG foo 2a
-../tests/test.rem(414): Trig = Saturday, 16 February, 1991 AT 02:00
+../tests/test.rem(423): Trig = Saturday, 16 February, 1991 AT 02:00
 foo 2a
 
 REM AT 3:00AM MSG foo 3a
-../tests/test.rem(415): Trig = Saturday, 16 February, 1991 AT 03:00
+../tests/test.rem(424): Trig = Saturday, 16 February, 1991 AT 03:00
 foo 3a
 
 REM AT 4:00am MSG foo 4a
-../tests/test.rem(416): Trig = Saturday, 16 February, 1991 AT 04:00
+../tests/test.rem(425): Trig = Saturday, 16 February, 1991 AT 04:00
 foo 4a
 
 REM AT 5:00AM MSG foo 5a
-../tests/test.rem(417): Trig = Saturday, 16 February, 1991 AT 05:00
+../tests/test.rem(426): Trig = Saturday, 16 February, 1991 AT 05:00
 foo 5a
 
 REM AT 6:00am MSG foo 6a
-../tests/test.rem(418): Trig = Saturday, 16 February, 1991 AT 06:00
+../tests/test.rem(427): Trig = Saturday, 16 February, 1991 AT 06:00
 foo 6a
 
 REM AT 7:00AM MSG foo 7a
-../tests/test.rem(419): Trig = Saturday, 16 February, 1991 AT 07:00
+../tests/test.rem(428): Trig = Saturday, 16 February, 1991 AT 07:00
 foo 7a
 
 REM AT 8:00am MSG foo 8a
-../tests/test.rem(420): Trig = Saturday, 16 February, 1991 AT 08:00
+../tests/test.rem(429): Trig = Saturday, 16 February, 1991 AT 08:00
 foo 8a
 
 REM AT 9:00AM MSG foo 9a
-../tests/test.rem(421): Trig = Saturday, 16 February, 1991 AT 09:00
+../tests/test.rem(430): Trig = Saturday, 16 February, 1991 AT 09:00
 foo 9a
 
 REM AT 10:00am MSG foo 10a
-../tests/test.rem(422): Trig = Saturday, 16 February, 1991 AT 10:00
+../tests/test.rem(431): Trig = Saturday, 16 February, 1991 AT 10:00
 foo 10a
 
 REM AT 11:00AM MSG foo 11a
-../tests/test.rem(423): Trig = Saturday, 16 February, 1991 AT 11:00
+../tests/test.rem(432): Trig = Saturday, 16 February, 1991 AT 11:00
 foo 11a
 
 REM AT 12:00am MSG foo 12a
-../tests/test.rem(424): Trig = Saturday, 16 February, 1991 AT 00:00
+../tests/test.rem(433): Trig = Saturday, 16 February, 1991 AT 00:00
 foo 12a
 
 REM AT 13:00AM MSG foo 13a
-../tests/test.rem(425): Expecting time after AT
+../tests/test.rem(434): Expecting time after AT
 REM AT 0:00pm MSG foo 0p
-../tests/test.rem(426): Expecting time after AT
+../tests/test.rem(435): Expecting time after AT
 REM AT 1:00PM MSG foo 1p
-../tests/test.rem(427): Trig = Saturday, 16 February, 1991 AT 13:00
+../tests/test.rem(436): Trig = Saturday, 16 February, 1991 AT 13:00
 foo 1p
 
 REM AT 2:00pm MSG foo 2p
-../tests/test.rem(428): Trig = Saturday, 16 February, 1991 AT 14:00
+../tests/test.rem(437): Trig = Saturday, 16 February, 1991 AT 14:00
 foo 2p
 
 REM AT 3:00PM MSG foo 3p
-../tests/test.rem(429): Trig = Saturday, 16 February, 1991 AT 15:00
+../tests/test.rem(438): Trig = Saturday, 16 February, 1991 AT 15:00
 foo 3p
 
 REM AT 4:00pm MSG foo 4p
-../tests/test.rem(430): Trig = Saturday, 16 February, 1991 AT 16:00
+../tests/test.rem(439): Trig = Saturday, 16 February, 1991 AT 16:00
 foo 4p
 
 REM AT 5:00PM MSG foo 5p
-../tests/test.rem(431): Trig = Saturday, 16 February, 1991 AT 17:00
+../tests/test.rem(440): Trig = Saturday, 16 February, 1991 AT 17:00
 foo 5p
 
 REM AT 6:00pm MSG foo 6p
-../tests/test.rem(432): Trig = Saturday, 16 February, 1991 AT 18:00
+../tests/test.rem(441): Trig = Saturday, 16 February, 1991 AT 18:00
 foo 6p
 
 REM AT 7:00PM MSG foo 7p
-../tests/test.rem(433): Trig = Saturday, 16 February, 1991 AT 19:00
+../tests/test.rem(442): Trig = Saturday, 16 February, 1991 AT 19:00
 foo 7p
 
 REM AT 8:00pm MSG foo 8p
-../tests/test.rem(434): Trig = Saturday, 16 February, 1991 AT 20:00
+../tests/test.rem(443): Trig = Saturday, 16 February, 1991 AT 20:00
 foo 8p
 
 REM AT 9:00PM MSG foo 9p
-../tests/test.rem(435): Trig = Saturday, 16 February, 1991 AT 21:00
+../tests/test.rem(444): Trig = Saturday, 16 February, 1991 AT 21:00
 foo 9p
 
 REM AT 10:00pm MSG foo 10p
-../tests/test.rem(436): Trig = Saturday, 16 February, 1991 AT 22:00
+../tests/test.rem(445): Trig = Saturday, 16 February, 1991 AT 22:00
 foo 10p
 
 REM AT 11:00PM MSG foo 11p
-../tests/test.rem(437): Trig = Saturday, 16 February, 1991 AT 23:00
+../tests/test.rem(446): Trig = Saturday, 16 February, 1991 AT 23:00
 foo 11p
 
 REM AT 12:00pm MSG foo 12p
-../tests/test.rem(438): Trig = Saturday, 16 February, 1991 AT 12:00
+../tests/test.rem(447): Trig = Saturday, 16 February, 1991 AT 12:00
 foo 12p
 
 REM AT 13:00PM MSG foo 13p
-../tests/test.rem(439): Expecting time after AT
+../tests/test.rem(448): Expecting time after AT
 
 DEBUG +x
 SET x 0:00am + 0
-../tests/test.rem(442): Ill-formed time
+../tests/test.rem(451): Ill-formed time
 SET x 1:00AM + 0
 01:00 + 0 => 01:00
 SET x 2:00am + 0
@@ -2866,10 +2931,10 @@ SET x 11:00AM + 0
 SET x 12:00am + 0
 00:00 + 0 => 00:00
 SET x 13:00AM + 0
-../tests/test.rem(455): Ill-formed time
+../tests/test.rem(464): Ill-formed time
 
 SET x 0:00pm + 0
-../tests/test.rem(457): Ill-formed time
+../tests/test.rem(466): Ill-formed time
 SET x 1:00PM + 0
 13:00 + 0 => 13:00
 SET x 2:00pm + 0
@@ -2895,10 +2960,10 @@ SET x 11:00PM + 0
 SET x 12:00pm + 0
 12:00 + 0 => 12:00
 SET x 13:00PM + 0
-../tests/test.rem(470): Ill-formed time
+../tests/test.rem(479): Ill-formed time
 
 SET x '2015-02-03@0:00am' + 0
-../tests/test.rem(472): Ill-formed time
+../tests/test.rem(481): Ill-formed time
 SET x '2015-02-03@1:00AM' + 0
 2015-02-03@01:00 + 0 => 2015-02-03@01:00
 SET x '2015-02-03@2:00am' + 0
@@ -2924,10 +2989,10 @@ SET x '2015-02-03@11:00AM' + 0
 SET x '2015-02-03@12:00am' + 0
 2015-02-03@00:00 + 0 => 2015-02-03@00:00
 SET x '2015-02-03@13:00AM' + 0
-../tests/test.rem(485): Ill-formed time
+../tests/test.rem(494): Ill-formed time
 
 SET x '2015-02-03@0:00pm' + 0
-../tests/test.rem(487): Ill-formed time
+../tests/test.rem(496): Ill-formed time
 SET x '2015-02-03@1:00PM' + 0
 2015-02-03@13:00 + 0 => 2015-02-03@13:00
 SET x '2015-02-03@2:00pm' + 0
@@ -2953,7 +3018,7 @@ SET x '2015-02-03@11:00PM' + 0
 SET x '2015-02-03@12:00pm' + 0
 2015-02-03@12:00 + 0 => 2015-02-03@12:00
 SET x '2015-02-03@13:00PM' + 0
-../tests/test.rem(500): Ill-formed time
+../tests/test.rem(509): Ill-formed time
 
 # Test the ampm function
 set x ampm(0:12) + ""
@@ -3049,88 +3114,88 @@ coerce("DATETIME", "2020-05-05@1:45pm") => 2020-05-05@13:45
 set a $IntMin - 1
 $IntMin => -2147483648
 -2147483648 - 1 => Number too high
-../tests/test.rem(539): `-': Number too high
+../tests/test.rem(548): `-': Number too high
 set a $IntMin - $IntMax
 $IntMin => -2147483648
 $IntMax => 2147483647
 -2147483648 - 2147483647 => Number too high
-../tests/test.rem(540): `-': Number too high
+../tests/test.rem(549): `-': Number too high
 set a $IntMax - $IntMin
 $IntMax => 2147483647
 $IntMin => -2147483648
 2147483647 - -2147483648 => Number too high
-../tests/test.rem(541): `-': Number too high
+../tests/test.rem(550): `-': Number too high
 set a $IntMax - (-1)
 $IntMax => 2147483647
 - 1 => -1
 2147483647 - -1 => Number too high
-../tests/test.rem(542): `-': Number too high
+../tests/test.rem(551): `-': Number too high
 set a $IntMax + 1
 $IntMax => 2147483647
 2147483647 + 1 => Number too high
-../tests/test.rem(543): `+': Number too high
+../tests/test.rem(552): `+': Number too high
 set a $IntMax + $IntMax
 $IntMax => 2147483647
 $IntMax => 2147483647
 2147483647 + 2147483647 => Number too high
-../tests/test.rem(544): `+': Number too high
+../tests/test.rem(553): `+': Number too high
 set a $IntMin + (-1)
 $IntMin => -2147483648
 - 1 => -1
 -2147483648 + -1 => Number too high
-../tests/test.rem(545): `+': Number too high
+../tests/test.rem(554): `+': Number too high
 set a $IntMin + $IntMin
 $IntMin => -2147483648
 $IntMin => -2147483648
 -2147483648 + -2147483648 => Number too high
-../tests/test.rem(546): `+': Number too high
+../tests/test.rem(555): `+': Number too high
 set a $IntMax * 2
 $IntMax => 2147483647
 2147483647 * 2 => Number too high
-../tests/test.rem(547): `*': Number too high
+../tests/test.rem(556): `*': Number too high
 set a $IntMax * $IntMax
 $IntMax => 2147483647
 $IntMax => 2147483647
 2147483647 * 2147483647 => Number too high
-../tests/test.rem(548): `*': Number too high
+../tests/test.rem(557): `*': Number too high
 set a $IntMax * $IntMin
 $IntMax => 2147483647
 $IntMin => -2147483648
 2147483647 * -2147483648 => Number too high
-../tests/test.rem(549): `*': Number too high
+../tests/test.rem(558): `*': Number too high
 set a $IntMin * 2
 $IntMin => -2147483648
 -2147483648 * 2 => Number too high
-../tests/test.rem(550): `*': Number too high
+../tests/test.rem(559): `*': Number too high
 set a $IntMin * $IntMin
 $IntMin => -2147483648
 $IntMin => -2147483648
 -2147483648 * -2147483648 => Number too high
-../tests/test.rem(551): `*': Number too high
+../tests/test.rem(560): `*': Number too high
 set a $IntMin * $IntMax
 $IntMin => -2147483648
 $IntMax => 2147483647
 -2147483648 * 2147483647 => Number too high
-../tests/test.rem(552): `*': Number too high
+../tests/test.rem(561): `*': Number too high
 set a $IntMin / (-1)
 $IntMin => -2147483648
 - 1 => -1
 -2147483648 / -1 => Number too high
-../tests/test.rem(553): `/': Number too high
+../tests/test.rem(562): `/': Number too high
 set a $IntMin * (-1)
 $IntMin => -2147483648
 - 1 => -1
 -2147483648 * -1 => Number too high
-../tests/test.rem(554): `*': Number too high
+../tests/test.rem(563): `*': Number too high
 set a (-1) * $IntMin
 - 1 => -1
 $IntMin => -2147483648
 -1 * -2147483648 => Number too high
-../tests/test.rem(555): `*': Number too high
+../tests/test.rem(564): `*': Number too high
 set a abs($IntMin)
 $IntMin => -2147483648
 abs(-2147483648) => Number too high
-../tests/test.rem(556): Number too high
+../tests/test.rem(565): Number too high
 
 # Don't want Remind to queue reminders
 EXIT
diff --git a/tests/test.rem b/tests/test.rem
index eb475640..aca0a06d 100644
--- a/tests/test.rem
+++ b/tests/test.rem
@@ -15,6 +15,15 @@ REM Wed UNTIL 15 Feb 1991 SATISFY [trigdate() > '1990-01-01'] MSG wookie
 # bad AT
 REM AT 0:00 0:01 0:02 MSG foo
 
+# Includecmd
+INCLUDECMD echo REM 16 Feb 1991 MSG Blork
+INCLUDECMD echo REM 18 Feb 1991 MSG Blork
+
+# This should work
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
+
+# This should fail
+INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo INCLUDECMD echo MSG Yippee
 REM MSG Today is [hebday(today())] [hebmon(today())] [hebyear(today())]
 fset _h(x, y) trigger(hebdate(x,y))