Improvements to holiday-mode.