diff --git a/src/calendar.c b/src/calendar.c
index 4533e170..919f6d9c 100644
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -757,7 +757,7 @@ InitMoonsAndShades(void)
 static void
 SetShadeEntry(int dse, char const *shade)
 {
-    int y, m, d;
+    int d;
     int r, g, b;
     /* Don't bother if we're not doing SHADE specials */
     if (!UseBGVTColors) {
@@ -774,7 +774,7 @@ SetShadeEntry(int dse, char const *shade)
     if (r < 0 || g < 0 || b < 0 || r > 255 || g > 255 || b > 255) {
         return;
     }
-    FromDSE(dse, &y, &m, &d);
+    FromDSE(dse, NULL, NULL, &d);
     bgcolor[d][0] = r;
     bgcolor[d][1] = g;
     bgcolor[d][2] = b;
@@ -784,7 +784,7 @@ static void
 SetMoonEntry(int dse, char const *moon)
 {
     int phase;
-    int y, m, d;
+    int d;
     char msg[28];
 
     /* Don't bother unless it's utf-8 */
@@ -803,7 +803,7 @@ SetMoonEntry(int dse, char const *moon)
         /* Bad phase */
         return;
     }
-    FromDSE(dse, &y, &m, &d);
+    FromDSE(dse, NULL, NULL, &d);
     if (msg[0]) {
         snprintf(moons[d], sizeof(moons[d]), "%s %s", moonphase_emojis[phase], msg);
     } else {
@@ -1476,13 +1476,13 @@ static void PrintCentered(char const *s, int width, char *pad)
 static int WriteOneCalLine(int start_dse, int wd)
 {
     int done = 1, i;
-    int y, m, d;
+    int d;
 
     gon();
     DRAW(tb);
     goff();
     for (i=0; i<7; i++) {
-        FromDSE(start_dse+i, &y, &m, &d);
+        FromDSE(start_dse+i, NULL, NULL, &d);
         d -= wd;
         if (CalColumn[i]) {
             Backgroundize(ColToDay[i]);
diff --git a/src/funcs.c b/src/funcs.c
index ddbdfe3a..de9c951c 100644
--- a/src/funcs.c
+++ b/src/funcs.c
@@ -485,21 +485,18 @@ static int FBaseyr(func_info *info)
 static int FDate(func_info *info)
 {
     int y, m, d;
-    int ytemp, mtemp, dtemp;
 
     /* Any arg can be a date (in which case we use the corresponding
        component) or an integer */
     if (HASDATE(ARG(0))) {
-        FromDSE(DATEPART(ARG(0)), &ytemp, &mtemp, &dtemp);
-        y = ytemp;
+        FromDSE(DATEPART(ARG(0)), &y, NULL, NULL);
     } else {
         ASSERT_TYPE(0, INT_TYPE);
         y = ARGV(0);
     }
 
     if (HASDATE(ARG(1))) {
-        FromDSE(DATEPART(ARG(1)), &ytemp, &mtemp, &dtemp);
-        m = mtemp;
+        FromDSE(DATEPART(ARG(1)), NULL, &m, NULL);
     } else {
         m = GETMON(1);
         if (m < 0) {
@@ -508,8 +505,7 @@ static int FDate(func_info *info)
     }
 
     if (HASDATE(ARG(2))) {
-        FromDSE(DATEPART(ARG(2)), &ytemp, &mtemp, &dtemp);
-        d = dtemp;
+        FromDSE(DATEPART(ARG(2)), NULL, NULL, &d);
     } else {
         ASSERT_TYPE(2, INT_TYPE);
         d = ARGV(2);
@@ -2858,7 +2854,7 @@ static int FEasterdate(func_info *info)
     int base;
     if (Nargs == 0) {
         base = DSEToday;
-        FromDSE(DSEToday, &y, &m, &d);
+        FromDSE(DSEToday, &y, NULL, NULL);
     } else {
         if (ARG(0).type == INT_TYPE) {
             base = -1;
@@ -2867,7 +2863,7 @@ static int FEasterdate(func_info *info)
             else if (y > BASE+YR_RANGE) return E_2HIGH;
         } else if (HASDATE(ARG(0))) {
             base = DATEPART(ARG(0));
-            FromDSE(DATEPART(ARG(0)), &y, &m, &d);  /* We just want the year */
+            FromDSE(DATEPART(ARG(0)), &y, NULL, NULL);  /* We just want the year */
         } else return E_BAD_TYPE;
     }
 
@@ -2911,7 +2907,7 @@ static int FOrthodoxeaster(func_info *info)
     int base = -1;
     if (Nargs == 0) {
         base = DSEToday;
-        FromDSE(DSEToday, &y, &m, &d);
+        FromDSE(DSEToday, &y, NULL, NULL);
     } else {
         if (ARG(0).type == INT_TYPE) {
             y = ARGV(0);
@@ -2919,7 +2915,7 @@ static int FOrthodoxeaster(func_info *info)
             else if (y > BASE+YR_RANGE) return E_2HIGH;
         } else if (HASDATE(ARG(0))) {
             base = DATEPART(ARG(0));
-            FromDSE(DATEPART(ARG(0)), &y, &m, &d);  /* We just want the year */
+            FromDSE(DATEPART(ARG(0)), &y, NULL, NULL);  /* We just want the year */
         } else return E_BAD_TYPE;
     }
 
diff --git a/src/omit.c b/src/omit.c
index ea9c2e25..c7b14469 100644
--- a/src/omit.c
+++ b/src/omit.c
@@ -242,7 +242,7 @@ int IsOmitted(int dse, int localomit, char const *omitfunc, int *omit)
         return OK;
     }
 
-    FromDSE(dse, &y, &m, &d);
+    FromDSE(dse, NULL, &m, &d);
     if (BexistsIntArray(PartialOmitArray, NumPartialOmits, (m << 5) + d)) {
         *omit = 1;
         return OK;
diff --git a/src/var.c b/src/var.c
index caa084dd..0be4b55b 100644
--- a/src/var.c
+++ b/src/var.c
@@ -285,7 +285,7 @@ static int trig_until_func(int do_set, Value *val)
 
 static int trig_day_func(int do_set, Value *val)
 {
-    int y, m, d;
+    int d;
     UNUSED(do_set);
     val->type = INT_TYPE;
     if (!LastTrigValid) {
@@ -293,7 +293,7 @@ static int trig_day_func(int do_set, Value *val)
         return OK;
     }
 
-    FromDSE(LastTriggerDate, &y, &m, &d);
+    FromDSE(LastTriggerDate, NULL, NULL, &d);
     val->v.val = d;
     return OK;
 }
@@ -312,7 +312,7 @@ static int timet_is_64_func(int do_set, Value *val)
 
 static int trig_mon_func(int do_set, Value *val)
 {
-    int y, m, d;
+    int m;
     UNUSED(do_set);
     val->type = INT_TYPE;
     if (!LastTrigValid) {
@@ -320,14 +320,14 @@ static int trig_mon_func(int do_set, Value *val)
         return OK;
     }
 
-    FromDSE(LastTriggerDate, &y, &m, &d);
+    FromDSE(LastTriggerDate, NULL, &m, NULL);
     val->v.val = m+1;
     return OK;
 }
 
 static int trig_year_func(int do_set, Value *val)
 {
-    int y, m, d;
+    int y;
     UNUSED(do_set);
     val->type = INT_TYPE;
     if (!LastTrigValid) {
@@ -335,7 +335,7 @@ static int trig_year_func(int do_set, Value *val)
         return OK;
     }
 
-    FromDSE(LastTriggerDate, &y, &m, &d);
+    FromDSE(LastTriggerDate, &y, NULL, NULL);
     val->v.val = y;
     return OK;
 }
@@ -362,30 +362,30 @@ static int today_date_func(int do_set, Value *val)
 }
 static int today_day_func(int do_set, Value *val)
 {
-    int y, m, d;
+    int d;
     UNUSED(do_set);
     val->type = INT_TYPE;
-    FromDSE(DSEToday, &y, &m, &d);
+    FromDSE(DSEToday, NULL, NULL, &d);
     val->v.val = d;
     return OK;
 }
 
 static int today_mon_func(int do_set, Value *val)
 {
-    int y, m, d;
+    int m;
     UNUSED(do_set);
     val->type = INT_TYPE;
-    FromDSE(DSEToday, &y, &m, &d);
+    FromDSE(DSEToday, NULL, &m, NULL);
     val->v.val = m+1;
     return OK;
 }
 
 static int today_year_func(int do_set, Value *val)
 {
-    int y, m, d;
+    int y;
     UNUSED(do_set);
     val->type = INT_TYPE;
-    FromDSE(DSEToday, &y, &m, &d);
+    FromDSE(DSEToday, &y, NULL, NULL);
     val->v.val = y;
     return OK;
 }