MDL-46814 calendar export: Minor coding tweaks