More until-I-fix-the-date-math hackery.