Code Cleanup: Calendar and Diary

.. comments just reflect current constraints and are not
actionable, so XXX removed.