Propagate earlier fixes from create-calendar.sh.  The two files can probably be
merged.