Fix to the previous fix.  Apparently most of the JS changes in the file
I got from @trob were for a custom calendar.  Keeping the three changes
we think were actual bug fixes.